diff --git a/config/init/upstart/lxc-instance.conf b/config/init/upstart/lxc-instance.conf deleted file mode 100644 index 1c9c3e60a0..0000000000 --- a/config/init/upstart/lxc-instance.conf +++ /dev/null @@ -1,20 +0,0 @@ -description "lxc instance" -author "Christian Kampka " - -stop on stopping lxc - -# wait for 120 seconds for container to shutdown before killing it -kill timeout 120 - -# send SIGPWR to container to trigger a shutdown (see lxc-shutdown(1)) -kill signal SIGPWR - - -instance $NAME -usage "NAME=name of LXC instance" - -pre-start script - lxc-wait -s RUNNING -n $NAME -t 0 && { stop; exit 0; } || true -end script - -exec lxc-start -F -n $NAME diff --git a/config/init/upstart/lxc-net.conf.in b/config/init/upstart/lxc-net.conf.in deleted file mode 100644 index 71c549994a..0000000000 --- a/config/init/upstart/lxc-net.conf.in +++ /dev/null @@ -1,8 +0,0 @@ -description "lxc network" -author "Serge Hallyn " - -start on starting lxc -stop on stopped lxc - -pre-start exec @LIBEXECDIR@/lxc/lxc-net start -post-stop exec @LIBEXECDIR@/lxc/lxc-net stop diff --git a/config/init/upstart/lxc.conf.in b/config/init/upstart/lxc.conf.in deleted file mode 100644 index 3bdfdf718c..0000000000 --- a/config/init/upstart/lxc.conf.in +++ /dev/null @@ -1,74 +0,0 @@ -description "lxc" -author "Serge Hallyn " - -start on runlevel [2345] -stop on starting rc RUNLEVEL=[016] - -env LXC_AUTO="false" - -# These can be overridden in /etc/default/lxc - -# BOOTGROUPS - What groups should start on bootup? -# Comma separated list of groups. -# Leading comma, trailing comma or embedded double -# comma indicates when the NULL group should be run. -# Example (default): boot the onboot group first then the NULL group -env BOOTGROUPS="onboot," - -# SHUTDOWNDELAY - Wait time for a container to shut down. -# Container shutdown can result in lengthy system -# shutdown times. Even 5 seconds per container can be -# too long. -env SHUTDOWNDELAY=5 - -# OPTIONS can be used for anything else. -# If you want to boot everything then -# options can be "-a" or "-a -A". -env OPTIONS= - -# STOPOPTS are stop options. The can be used for anything else to stop. -# If you want to kill containers fast, use -k -env STOPOPTS="-a -A -s" - -pre-start script - [ -f /etc/default/lxc ] && . /etc/default/lxc - - # don't load profiles if mount mediation is not supported - SYSF=/sys/kernel/security/apparmor/features/mount/mask - if [ -f $SYSF ]; then - if [ -x /lib/apparmor/profile-load ]; then - /lib/apparmor/profile-load usr.bin.lxc-start - /lib/apparmor/profile-load lxc-containers - elif [ -x /lib/init/apparmor-profile-load ]; then - /lib/init/apparmor-profile-load usr.bin.lxc-start - /lib/init/apparmor-profile-load lxc-containers - fi - fi - - [ "x$LXC_AUTO" = "xtrue" ] || exit 0 - - if [ -n "$BOOTGROUPS" ] - then - BOOTGROUPS="-g $BOOTGROUPS" - fi - - # Process the "onboot" group first then the NULL group. - lxc-autostart -L $OPTIONS $BOOTGROUPS | while read line; do - set -- $line - (start lxc-instance NAME=$1 && sleep $2) || true - done -end script - -# The stop is serialized and can take excessive time. We need to avoid -# delaying the system shutdown / reboot as much as we can since it's not -# parallelized... Even 5 second timeout may be too long. -post-stop script - [ -f /etc/default/lxc ] && . /etc/default/lxc - - if [ -n "$SHUTDOWNDELAY" ] - then - SHUTDOWNDELAY="-t $SHUTDOWNDELAY" - fi - - lxc-autostart $STOPOPTS $SHUTDOWNDELAY || true -end script diff --git a/config/init/upstart/meson.build b/config/init/upstart/meson.build deleted file mode 100644 index b0afc0b21b..0000000000 --- a/config/init/upstart/meson.build +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -if 'upstart' in init_script - configure_file( - configuration: conf, - input: 'lxc.conf.in', - output: 'lxc.conf', - install: true, - install_dir: join_paths(sysconfdir, 'init')) - - configure_file( - configuration: conf, - input: 'lxc-instance.conf', - output: 'lxc-instance.conf', - install: true, - install_dir: join_paths(sysconfdir, 'init')) - - configure_file( - configuration: conf, - input: 'lxc-net.conf.in', - output: 'lxc-net.conf', - install: true, - install_dir: join_paths(sysconfdir, 'init')) -endif diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in index 9b0b01ba1b..a1d82faed2 100644 --- a/doc/ja/lxc.container.conf.sgml.in +++ b/doc/ja/lxc.container.conf.sgml.in @@ -597,23 +597,6 @@ by KATOH Yasufumi 現時点では、以下のネットワーク仮想化のタイプが使えます: - - - ホストのネットワーク名前空間を共有します。 - これにより、ホストのネットワークデバイスをコンテナ内で使うことが可能になります。 - もしコンテナもホストも init として upstart を使っている場合、(例えば) コンテナ内で 'halt' を実行すると、ホストがシャットダウンしてしまうことにもなります。 - 非特権コンテナでは、sysfs をマウントできないので、この設定は動作しません。この問題に対する回避策は、ホストの sysfs を bind マウントすることです。ただしこの回避策は安全ではありません。 - - - 호스트의 네트워크 네임스페이스를 공유한다. 이렇게 하면 호스트의 네트워크 장치를 컨테이너 내에서 사용가능하다. - 컨테이너와 호스트 둘다 init에서 upstart를 사용하는 경우, (예를 들어) 컨테이너에서 'halt'를 하면, 호스트의 것도 종료된다. - -