From fdf1a22b9278313dc497d6f026ebe6b9acbaa718 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Mon, 12 Feb 2024 21:31:58 +0100 Subject: [PATCH] Use the ubuntu-desktop-bootstrap snap as the Ubuntu Desktop installer --- debian/changelog | 6 ++++++ live-build/auto/config | 2 +- .../usr/lib/systemd/user/ubuntu-desktop-installer.service | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 18ac4b33..691daca5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (24.04.31) UNRELEASED; urgency=medium + + * Use the ubuntu-desktop-bootstrap snap as the Ubuntu Desktop installer + + -- Sebastien Bacher Mon, 12 Feb 2024 21:30:16 +0100 + livecd-rootfs (24.04.30) noble; urgency=medium [ Heinrich Schuchardt ] diff --git a/live-build/auto/config b/live-build/auto/config index 4fe67dcd..2915697c 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -779,7 +779,7 @@ case $PROJECT in add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages add_task minimal.standard.live ubuntu-live remove_package minimal.standard.live ubiquity-frontend-gtk - add_snap minimal.standard.live ubuntu-desktop-installer/classic + add_snap minimal.standard.live ubuntu-desktop-bootstrap/classic add_package minimal.standard.live linux-$KERNEL_FLAVOURS casper cat <<-EOF > config/minimal.catalog-in.yaml diff --git a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/user/ubuntu-desktop-installer.service b/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/user/ubuntu-desktop-installer.service index 00fa4649..571e7258 100644 --- a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/user/ubuntu-desktop-installer.service +++ b/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/user/ubuntu-desktop-installer.service @@ -10,6 +10,6 @@ Conflicts=gnome-session@gnome-login.target [Service] Type=oneshot -ExecStart=/snap/bin/ubuntu-desktop-installer --try-or-install +ExecStart=/snap/bin/ubuntu-desktop-bootstrap --try-or-install ExecStopPost=sh -c "gsettings set org.gnome.shell.extensions.dash-to-dock dock-fixed true; gsettings set org.gnome.shell.extensions.dash-to-dock intellihide true; gnome-extensions enable ding@rastersoft.com" Restart=no