Merge branch 'ubuntu/master' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu-core-desktop-noble

debian/changelog

@@ -1,3 +1,15 @@
+livecd-rootfs (24.04.69) noble; urgency=medium
+
+  * desktop: move udisks2-inhibit to service (LP: #2063192)
+
+ -- Dan Bungert <daniel.bungert@canonical.com>  Tue, 23 Apr 2024 13:37:05 -0600
+
+livecd-rootfs (24.04.68) noble; urgency=medium
+
+  * Rename the milk-v-mars SUBARCH to milkvmars.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Tue, 23 Apr 2024 15:20:56 +0100
+
 livecd-rootfs (24.04.67) noble; urgency=medium
 
   [ Julian Andres Klode ]

live-build/auto/config

@@ -9,7 +9,7 @@ case $ARCH:$SUBARCH in
 	i386:|\
 	ppc64el:|\
 	riscv64:|riscv64:generic|riscv64:icicle|riscv64:licheerv|\
-	riscv64:milk-v-mars|riscv64:nezha|riscv64:unmatched|riscv64:visionfive|\
+	riscv64:milkvmars|riscv64:nezha|riscv64:unmatched|riscv64:visionfive|\
 	riscv64:visionfive2|\
 	s390x:|\
 	*appliance*)
@@ -394,7 +394,7 @@ if [ "$IMAGEFORMAT" = "ext4" ] && [ "$PROJECT" = "ubuntu-cpc" ]; then
 	case $ARCH:$SUBARCH in
 		riscv64:icicle | \
 		riscv64:licheerv | \
-		riscv64:milk-v-mars | \
+		riscv64:milkvmars | \
 		riscv64:nezha | \
 		riscv64:unmatched | \
 		riscv64:visionfive | \

live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary

@@ -132,7 +132,7 @@ create_partitions() {
                         --change-name=3:uEnv \
                         --new=1:: \
                         --attributes=1:set:2
-            elif [ "${SUBARCH:-}" = "visionfive2" ] || [ "${SUBARCH:-}" = "milk-v-mars" ]; then
+            elif [ "${SUBARCH:-}" = "visionfive2" ] || [ "${SUBARCH:-}" = "milkvmars" ]; then
                 # VisionFive 2, Milk-V Mars
                 sgdisk "${disk_image}" \
                         --set-alignment=4096 \
@@ -285,7 +285,7 @@ install_grub() {
                         loader="${loop_device}p13"
                         dd if=mountpoint/usr/lib/u-boot/microchip_icicle/u-boot.payload of=$loader
                         ;;
-                    "milk-v-mars")
+                    "milkvmars")
                         cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/
                         # flash-kernel is needed to install the dtb for update-grub: it uses the
                         # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,

live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/graphical.target.wants/udisks2-inhibit.service

@@ -0,0 +1 @@
+../udisks2-inhibit.service

live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/udisks2-inhibit.service

@@ -0,0 +1,19 @@
+[Unit]
+Description=inhibit disk automounting
+Before=udisks2.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+
+ExecStart=mkdir -p /run/udev/rules.d
+ExecStart=sh -c "echo 'SUBSYSTEM==\"block\", ENV{UDISKS_IGNORE}=\"1\"' > /run/udev/rules.d/10-udisks-inhibit.rules"
+ExecStart=udevadm control --reload
+ExecStart=udevadm trigger --subsystem-match=block
+
+ExecStopPost=rm -f /run/udev/rules.d/10-udisks-inhibit.rules
+ExecStopPost=udevadm control --reload
+ExecStopPost=udevadm trigger --subsystem-match=block
+
+[Install]
+WantedBy=graphical.target