From cfcac9232877bb1152626e44ef24876a370c7587 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 14 Feb 2018 12:46:06 +1300 Subject: [PATCH] Import patches-unapplied version 2.502 to ubuntu/bionic-proposed Imported using git-ubuntu import. Changelog parent: 3b7b54098b3d623356022f67e11cc8456dc095ea New changelog entries: * Shuffle subiquity service definition to a mix of a snapd-generated service file (from the subiquity snap) and an overlay (in this package). --- debian/changelog | 7 +++++ .../getty@tty1.service.d/conditional.conf | 2 ++ .../multi-user.target.wants/subiquity.service | 1 - .../subiquity.conf | 14 ++++++++++ .../systemd/system/subiquity-debug@.service | 24 ---------------- .../lib/systemd/system/subiquity.service | 28 ------------------- 6 files changed, 23 insertions(+), 53 deletions(-) create mode 100644 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@tty1.service.d/conditional.conf delete mode 120000 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/multi-user.target.wants/subiquity.service create mode 100644 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf delete mode 100644 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service delete mode 100644 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service diff --git a/debian/changelog b/debian/changelog index 90970f57..7ddcda39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.502) bionic; urgency=medium + + * Shuffle subiquity service definition to a mix of a snapd-generated service + file (from the subiquity snap) and an overlay (in this package). + + -- Michael Hudson-Doyle Wed, 14 Feb 2018 12:46:06 +1300 + livecd-rootfs (2.501) bionic; urgency=medium * Stop building ova, vmdk, vagrant images on i386. diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@tty1.service.d/conditional.conf b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@tty1.service.d/conditional.conf new file mode 100644 index 00000000..da3eed67 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@tty1.service.d/conditional.conf @@ -0,0 +1,2 @@ +[Unit] +ConditionPathExists=/run/subiquity/complete \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/multi-user.target.wants/subiquity.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/multi-user.target.wants/subiquity.service deleted file mode 120000 index 4d9ea45c..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/multi-user.target.wants/subiquity.service +++ /dev/null @@ -1 +0,0 @@ -../subiquity.service \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf new file mode 100644 index 00000000..9ae26356 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf @@ -0,0 +1,14 @@ +[Unit] +IgnoreOnIsolate=yes +After=systemd-user-sessions.service plymouth-quit-wait.service +ConditionPathExists=!/run/subiquity/complete + +[Service] +UtmpIdentifier=tty1 +TTYPath=/dev/tty1 +TTYReset=yes +TTYVHangup=yes +TTYVTDisallocate=yes +KillMode=process +IgnoreSIGPIPE=no +SendSIGHUP=yes diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service deleted file mode 100644 index 3a7edb15..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service +++ /dev/null @@ -1,24 +0,0 @@ -[Unit] -Description=Subiquity debug shell %I -After=systemd-user-sessions.service plymouth-quit-wait.service -After=rc-local.service -IgnoreOnIsolate=yes -ConditionPathExists=/dev/tty0 -ConditionPathExists=!/run/subiquity/complete - -[Service] -Environment=PYTHONPATH=/usr/share/subiquity -ExecStartPre=/bin/systemctl stop getty@%I -ExecStart=/sbin/agetty -n --noclear -l /usr/share/subiquity/subiquity-debug %I $TERM -ExecStopPost=/bin/systemctl start getty@%I -Type=idle -Restart=always -RestartSec=0 -UtmpIdentifier=%I -TTYPath=/dev/%I -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes -KillMode=process -IgnoreSIGPIPE=no -SendSIGHUP=yes diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service deleted file mode 100644 index 5357f04f..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service +++ /dev/null @@ -1,28 +0,0 @@ -[Unit] -Description=Subiquity, the installer for Ubuntu Server -After=systemd-user-sessions.service plymouth-quit-wait.service -After=rc-local.service -Requires=snapd.service -IgnoreOnIsolate=yes -ConditionPathExists=/dev/tty0 -ConditionPathExists=!/run/subiquity/complete - -[Service] -Environment=PYTHONPATH=/usr/share/subiquity -Environment=SNAP_REEXEC=0 -ExecStartPre=/bin/systemctl stop getty@tty1 -ExecStartPre=/bin/dmesg -n 1 -ExecStartPre=/snap/bin/subiquity.subiquity-loadkeys -ExecStart=/sbin/agetty -n --noclear -l /snap/bin/subiquity tty1 $TERM -ExecStopPost=/bin/systemctl start getty@tty1 -Type=idle -Restart=always -RestartSec=0 -UtmpIdentifier=tty1 -TTYPath=/dev/tty1 -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes -KillMode=process -IgnoreSIGPIPE=no -SendSIGHUP=yes