From 5e990020e5280152ce7387b707ad5c6dba623ae4 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Wed, 2 Oct 2024 08:20:34 -0600 Subject: [PATCH] desktop: remove references to subiquity snap No subiquity snap is present on Desktop isos, these are cruft. --- .../usr/bin/subiquity-shell | 3 --- .../systemd/system/getty@.service.d/autologin.conf | 3 --- .../serial-getty@.service.d/subiquity-serial.conf | 9 --------- .../subiquity-serial.conf | 4 ---- .../subiquity.conf | 14 -------------- 5 files changed, 33 deletions(-) delete mode 100755 live-build/ubuntu/includes.chroot.minimal.standard.live/usr/bin/subiquity-shell delete mode 100644 live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/getty@.service.d/autologin.conf delete mode 100644 live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf delete mode 100644 live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf delete mode 100644 live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf diff --git a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/bin/subiquity-shell b/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/bin/subiquity-shell deleted file mode 100755 index d739d86f..00000000 --- a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/bin/subiquity-shell +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -exec sudo snap run subiquity - diff --git a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/getty@.service.d/autologin.conf b/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/getty@.service.d/autologin.conf deleted file mode 100644 index a166aab4..00000000 --- a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/getty@.service.d/autologin.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -ExecStart= -ExecStart=-/sbin/agetty --noclear -n --autologin ubuntu-server %I $TERM diff --git a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf b/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf deleted file mode 100644 index eebf38b4..00000000 --- a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Subiquity, the installer for Ubuntu Server %I -After=snapd.seeded.service -StartLimitInterval=0 - -[Service] -Environment=SNAP_REEXEC=0 -ExecStart= -ExecStart=/usr/bin/snap run subiquity.subiquity-service %I diff --git a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf b/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf deleted file mode 100644 index 56900a35..00000000 --- a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf +++ /dev/null @@ -1,4 +0,0 @@ -[Service] -StandardOutput=tty -ExecStart= -ExecStart=/usr/bin/snap run subiquity --ssh diff --git a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf b/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf deleted file mode 100644 index c1af5666..00000000 --- a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -IgnoreOnIsolate=yes -After=systemd-user-sessions.service plymouth-quit-wait.service snap.seeded.service - -[Service] -Environment=SNAP_REEXEC=0 -UtmpIdentifier=tty1 -TTYPath=/dev/tty1 -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes -KillMode=process -IgnoreSIGPIPE=no -SendSIGHUP=yes