From fb73c18d2dd3d55b4aa2c2803ce4603c7dad4b53 Mon Sep 17 00:00:00 2001
From: Simon Deziel <simon.deziel@canonical.com>
Date: Fri, 24 Nov 2023 14:20:09 -0500
Subject: [PATCH 1/4] meson: Remove support for upstart

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
---
 meson.build       | 1 -
 meson_options.txt | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index cb6f17fa4c..d1527679e7 100644
--- a/meson.build
+++ b/meson.build
@@ -886,7 +886,6 @@ subdir('config/etc')
 subdir('config/init/common')
 subdir('config/init/systemd')
 subdir('config/init/sysvinit')
-subdir('config/init/upstart')
 if want_selinux
     subdir('config/selinux')
 endif
diff --git a/meson_options.txt b/meson_options.txt
index 7eb14e92c1..5af850be9c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -15,7 +15,7 @@ option('examples', type: 'boolean', value: 'true',
 
 # was --init-script in autotools
 option('init-script', type : 'array',
-       choices : ['systemd', 'sysvinit', 'upstart'], value : ['systemd'],
+       choices : ['systemd', 'sysvinit'], value : ['systemd'],
        description : 'init script')
 
 # was --systemd-unidir in autotools

From 7bf1695d0d70b83c6fc19e59e1aec2a9a0c037fc Mon Sep 17 00:00:00 2001
From: Simon Deziel <simon.deziel@canonical.com>
Date: Fri, 24 Nov 2023 14:20:43 -0500
Subject: [PATCH 2/4] hooks/ubuntu-cloud-prep: remove upstart handling

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
---
 hooks/ubuntu-cloud-prep | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/hooks/ubuntu-cloud-prep b/hooks/ubuntu-cloud-prep
index b89e79fbf7..285c8f7889 100755
--- a/hooks/ubuntu-cloud-prep
+++ b/hooks/ubuntu-cloud-prep
@@ -95,11 +95,6 @@ prep() {
         error "${0##*}: usage failed, continuing with defaults"
     fi
 
-    [ "$create_etc_init" -eq 0 ] ||
-        echo "#upstart needs help for overlayfs (LP: #1213925)." > \
-            "$root_d/etc/init/.overlayfs-upstart-helper" ||
-        { error "failed to create /etc/init in overlay"; return 1; }
-
     local seed_d=""
     seed_d="$root_d/var/lib/cloud/seed/nocloud-net"
 

From 79a4a3cf8edc39ee3fad3cf01f2da91492007eae Mon Sep 17 00:00:00 2001
From: Simon Deziel <simon.deziel@canonical.com>
Date: Fri, 24 Nov 2023 14:21:21 -0500
Subject: [PATCH 3/4] doc: remove the warning mentionning upstart

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
---
 doc/ja/lxc.container.conf.sgml.in | 17 -----------------
 doc/ko/lxc.container.conf.sgml.in | 13 -------------
 doc/lxc.container.conf.sgml.in    | 11 -----------
 3 files changed, 41 deletions(-)

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 <karma at jazz.email.ne.jp>
               現時点では、以下のネットワーク仮想化のタイプが使えます:
             </para>
 
-            <para>
-              <!--
-              <option>none:</option> will cause the container to share
-              the host's network namespace.  This means the host
-              network devices are usable in the container.  It also
-              means that if both the container and host have upstart as
-              init, 'halt' in a container (for instance) will shut down the
-              host. Note that unprivileged containers do not work with this
-              setting due to an inability to mount sysfs. An unsafe workaround
-              would be to bind mount the host's sysfs.
-              -->
-              <option>none:</option> ホストのネットワーク名前空間を共有します。
-              これにより、ホストのネットワークデバイスをコンテナ内で使うことが可能になります。
-              もしコンテナもホストも init として upstart を使っている場合、(例えば) コンテナ内で 'halt' を実行すると、ホストがシャットダウンしてしまうことにもなります。
-              非特権コンテナでは、sysfs をマウントできないので、この設定は動作しません。この問題に対する回避策は、ホストの sysfs を bind マウントすることです。ただしこの回避策は安全ではありません。
-            </para>
-
             <para>
               <!--
               <option>empty:</option> will create only the loopback
diff --git a/doc/ko/lxc.container.conf.sgml.in b/doc/ko/lxc.container.conf.sgml.in
index 3ca030406b..a5f17a6459 100644
--- a/doc/ko/lxc.container.conf.sgml.in
+++ b/doc/ko/lxc.container.conf.sgml.in
@@ -447,19 +447,6 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
               지정 가능한 형태는 아래와 같다.
 	    </para>
 
-	    <para>
-              <!--
-	      <option>none:</option> will cause the container to share
-	      the host's network namespace.  This means the host
-	      network devices are usable in the container.  It also
-	      means that if both the container and host have upstart as
-	      init, 'halt' in a container (for instance) will shut down the
-	      host.
-              -->
-              <option>none:</option> 호스트의 네트워크 네임스페이스를 공유한다. 이렇게 하면 호스트의 네트워크 장치를 컨테이너 내에서 사용가능하다.
-              컨테이너와 호스트 둘다 init에서 upstart를 사용하는 경우, (예를 들어) 컨테이너에서 'halt'를 하면, 호스트의 것도 종료된다.
-	    </para>
-
 	    <para>
               <!--
 	      <option>empty:</option> will create only the loopback
diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in
index 9c5db9ba14..8726341f2a 100644
--- a/doc/lxc.container.conf.sgml.in
+++ b/doc/lxc.container.conf.sgml.in
@@ -452,17 +452,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
               Currently, the different virtualization types can be:
             </para>
 
-            <para>
-              <option>none:</option> will cause the container to share
-              the host's network namespace.  This means the host
-              network devices are usable in the container.  It also
-              means that if both the container and host have upstart as
-              init, 'halt' in a container (for instance) will shut down the
-              host. Note that unprivileged containers do not work with this
-	      setting due to an inability to mount sysfs. An unsafe workaround
-	      would be to bind mount the host's sysfs.
-            </para>
-
             <para>
               <option>empty:</option> will create only the loopback
               interface.

From abffab441ea26c365e2d84bd8677c3ab0a5e8799 Mon Sep 17 00:00:00 2001
From: Simon Deziel <simon.deziel@canonical.com>
Date: Fri, 24 Nov 2023 14:19:44 -0500
Subject: [PATCH 4/4] config/init: Drop upstart files

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
---
 config/init/upstart/lxc-instance.conf | 20 --------
 config/init/upstart/lxc-net.conf.in   |  8 ---
 config/init/upstart/lxc.conf.in       | 74 ---------------------------
 config/init/upstart/meson.build       | 24 ---------
 4 files changed, 126 deletions(-)
 delete mode 100644 config/init/upstart/lxc-instance.conf
 delete mode 100644 config/init/upstart/lxc-net.conf.in
 delete mode 100644 config/init/upstart/lxc.conf.in
 delete mode 100644 config/init/upstart/meson.build

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 <chris@emerge-life.de>"
-
-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 <serge.hallyn@canonical.com>"
-
-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 <serge.hallyn@canonical.com>"
-
-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