diff --git a/debian/changelog b/debian/changelog index 750991c1..368f19a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ livecd-rootfs (23.10.22) UNRELEASED; urgency=medium * Undo preseeding in reset_snapd_state. * update-source-catalog: work better when we want a variation to point at the base layer. + * Stop launching a gnome-terminal at startup of the canary live session. + (LP: #2032647) -- Michael Hudson-Doyle Fri, 25 Aug 2023 11:44:57 +1200 diff --git a/live-build/ubuntu/hooks/020-canary-live.binary b/live-build/ubuntu/hooks/020-canary-live.binary index 955e738d..e0e294e3 100755 --- a/live-build/ubuntu/hooks/020-canary-live.binary +++ b/live-build/ubuntu/hooks/020-canary-live.binary @@ -145,24 +145,6 @@ mode=run recovery_system=classic-installer EOF -# Temporary while we still use the subiquity TUI for the live system -cat > chroot/usr/lib/systemd/user/subiquity-tui.service << EOF -[Unit] -Description=subiquity tui -PartOf=graphical-session.target -After=graphical-session.target - -# Never run in GDM -Conflicts=gnome-session@gnome-login.target - -[Service] -Type=simple -ExecStart=/usr/bin/gnome-terminal --wait -- sudo sh -c 'echo waiting for snapd; snap wait system seed.loaded; sleep 5; snap run subiquity' -Restart=no -EOF -mkdir chroot/etc/systemd/user/graphical-session.target.wants/ -ln -vs /usr/lib/systemd/user/subiquity-tui.service chroot/etc/systemd/user/graphical-session.target.wants/ - mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-generic mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-generic chmod a+r ${PWD}/livecd.${PROJECT}.initrd-generic ${PWD}/livecd.${PROJECT}.kernel-generic