From a2ebc11be05957b39ef006ebf3ff81ecae77eca4 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 22 Mar 2024 11:59:46 +0100 Subject: [PATCH] Rename the casper.gschema override to livecd-rootfs.override to try to avoid conflicts with the override generated in casper --- live-build/auto/config | 2 +- .../{casper.gschema.override => livecd-rootfs.gschema.override} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename live-build/ubuntu/includes.chroot.minimal.standard.live/usr/share/glib-2.0/schemas/{casper.gschema.override => livecd-rootfs.gschema.override} (100%) diff --git a/live-build/auto/config b/live-build/auto/config index 0e5b50db..88f0e873 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1585,7 +1585,7 @@ case $PROJECT in # these files are expected to be moved out of livecd-rootfs, # and are also incorrect for flavors. rm -f config/includes.chroot.$LIVE_LAYER/usr/lib/systemd/user/ubuntu-desktop-installer.service - rm -f config/includes.chroot.$LIVE_LAYER/share/glib-2.0/schemas/casper.gschema.override + rm -f config/includes.chroot.$LIVE_LAYER/share/glib-2.0/schemas/livecd-rootfs.gschema.override fi ;; esac diff --git a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/share/glib-2.0/schemas/casper.gschema.override b/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/share/glib-2.0/schemas/livecd-rootfs.gschema.override similarity index 100% rename from live-build/ubuntu/includes.chroot.minimal.standard.live/usr/share/glib-2.0/schemas/casper.gschema.override rename to live-build/ubuntu/includes.chroot.minimal.standard.live/usr/share/glib-2.0/schemas/livecd-rootfs.gschema.override