From 2aeb74e5b88c843b0883c85a06b62e65541a468d Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Thu, 25 Jan 2024 08:29:11 +0000 Subject: [PATCH] Imported 24.04.21 from noble-release pocket. No reason for CPC update specified. --- debian/changelog | 53 +++++++++++++++++++ live-build/apparmor/6.6/capability | 1 + live-build/apparmor/6.6/caps/mask | 1 + live-build/apparmor/6.6/dbus/mask | 1 + .../6.6/domain/attach_conditions/xattr | 1 + live-build/apparmor/6.6/domain/change_hat | 1 + live-build/apparmor/6.6/domain/change_hatv | 1 + live-build/apparmor/6.6/domain/change_onexec | 1 + live-build/apparmor/6.6/domain/change_profile | 1 + .../apparmor/6.6/domain/computed_longest_left | 1 + .../apparmor/6.6/domain/fix_binfmt_elf_mmap | 1 + .../apparmor/6.6/domain/post_nnp_subset | 1 + live-build/apparmor/6.6/domain/stack | 1 + live-build/apparmor/6.6/domain/version | 1 + live-build/apparmor/6.6/file/mask | 1 + live-build/apparmor/6.6/io_uring/mask | 1 + live-build/apparmor/6.6/ipc/posix_mqueue | 1 + live-build/apparmor/6.6/mount/mask | 1 + live-build/apparmor/6.6/namespaces/mask | 1 + live-build/apparmor/6.6/namespaces/pivot_root | 1 + live-build/apparmor/6.6/namespaces/profile | 1 + live-build/apparmor/6.6/network/af_mask | 1 + live-build/apparmor/6.6/network/af_unix | 1 + live-build/apparmor/6.6/network_v8/af_mask | 1 + live-build/apparmor/6.6/policy/outofband | 1 + live-build/apparmor/6.6/policy/set_load | 1 + live-build/apparmor/6.6/policy/versions/v5 | 1 + live-build/apparmor/6.6/policy/versions/v6 | 1 + live-build/apparmor/6.6/policy/versions/v7 | 1 + live-build/apparmor/6.6/policy/versions/v8 | 1 + live-build/apparmor/6.6/policy/versions/v9 | 1 + live-build/apparmor/6.6/ptrace/mask | 1 + live-build/apparmor/6.6/query/label/data | 1 + .../6.6/query/label/multi_transaction | 1 + live-build/apparmor/6.6/query/label/perms | 1 + live-build/apparmor/6.6/rlimit/mask | 1 + live-build/apparmor/6.6/signal/mask | 1 + live-build/auto/build | 7 +-- live-build/auto/config | 25 +++++++++ live-build/functions | 15 +++++- .../hooks/01-unminimize.chroot_early | 30 ++++++++--- .../ubuntu/hooks/020-ubuntu-live.chroot_early | 6 ++- 42 files changed, 159 insertions(+), 13 deletions(-) create mode 100644 live-build/apparmor/6.6/capability create mode 100644 live-build/apparmor/6.6/caps/mask create mode 100644 live-build/apparmor/6.6/dbus/mask create mode 100644 live-build/apparmor/6.6/domain/attach_conditions/xattr create mode 100644 live-build/apparmor/6.6/domain/change_hat create mode 100644 live-build/apparmor/6.6/domain/change_hatv create mode 100644 live-build/apparmor/6.6/domain/change_onexec create mode 100644 live-build/apparmor/6.6/domain/change_profile create mode 100644 live-build/apparmor/6.6/domain/computed_longest_left create mode 100644 live-build/apparmor/6.6/domain/fix_binfmt_elf_mmap create mode 100644 live-build/apparmor/6.6/domain/post_nnp_subset create mode 100644 live-build/apparmor/6.6/domain/stack create mode 100644 live-build/apparmor/6.6/domain/version create mode 100644 live-build/apparmor/6.6/file/mask create mode 100644 live-build/apparmor/6.6/io_uring/mask create mode 100644 live-build/apparmor/6.6/ipc/posix_mqueue create mode 100644 live-build/apparmor/6.6/mount/mask create mode 100644 live-build/apparmor/6.6/namespaces/mask create mode 100644 live-build/apparmor/6.6/namespaces/pivot_root create mode 100644 live-build/apparmor/6.6/namespaces/profile create mode 100644 live-build/apparmor/6.6/network/af_mask create mode 100644 live-build/apparmor/6.6/network/af_unix create mode 100644 live-build/apparmor/6.6/network_v8/af_mask create mode 100644 live-build/apparmor/6.6/policy/outofband create mode 100644 live-build/apparmor/6.6/policy/set_load create mode 100644 live-build/apparmor/6.6/policy/versions/v5 create mode 100644 live-build/apparmor/6.6/policy/versions/v6 create mode 100644 live-build/apparmor/6.6/policy/versions/v7 create mode 100644 live-build/apparmor/6.6/policy/versions/v8 create mode 100644 live-build/apparmor/6.6/policy/versions/v9 create mode 100644 live-build/apparmor/6.6/ptrace/mask create mode 100644 live-build/apparmor/6.6/query/label/data create mode 100644 live-build/apparmor/6.6/query/label/multi_transaction create mode 100644 live-build/apparmor/6.6/query/label/perms create mode 100644 live-build/apparmor/6.6/rlimit/mask create mode 100644 live-build/apparmor/6.6/signal/mask diff --git a/debian/changelog b/debian/changelog index 285dda7d..00e7f999 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,56 @@ +livecd-rootfs (24.04.21) noble; urgency=medium + + * live-build/functions: avoid losetup -P as it appears to race with udev and + do it a bit more by-hand instead. (LP: #2045586) + + -- Michael Hudson-Doyle Thu, 25 Jan 2024 10:28:38 +1300 + +livecd-rootfs (24.04.20) noble; urgency=medium + + * fix: Fix for calling unminimize if lxd-installer package + not installed. (LP: #2049723) + * Do not exit live image build if PASSES_TO_LAYERS is true and layer + is already registered. + + -- Philip Roche Thu, 25 Jan 2024 07:57:29 +1300 + +livecd-rootfs (24.04.19) noble; urgency=medium + + * live-build/auto/config: don't repeatedly add the same pass name to the + list of layers. + + -- Steve Langasek Thu, 18 Jan 2024 11:03:55 -0800 + +livecd-rootfs (24.04.18) noble; urgency=medium + + * update apparmor feature overlay match for target 6.6 kernel. + + -- Thomas Bechtold Tue, 16 Jan 2024 13:06:37 +0100 + +livecd-rootfs (24.04.17) noble; urgency=medium + + * unminimize: Use lxd-installer to install LXD itself. (LP: #2036725) + + -- Utkarsh Gupta Thu, 11 Jan 2024 15:12:53 +0530 + +livecd-rootfs (24.04.16) noble; urgency=medium + + * Fix overlooked syntax error in live-build/auto/config. + + -- Steve Langasek Wed, 03 Jan 2024 23:38:53 -0800 + +livecd-rootfs (24.04.15) noble; urgency=medium + + * live-build/ubuntu/hooks/020-ubuntu-live.chroot_early: apply to any + layer ending in .live so this can be reused across flavors + * live-build/ubuntu/hooks/020-ubuntu-live.chroot_early: check for + glib-compile-schemas presence before calling + * live-build/auto/config: include a sanity check that no layered image has + more than one "live" layer that would cause undefined behavior with the + above hook. + + -- Steve Langasek Wed, 03 Jan 2024 23:26:05 -0800 + livecd-rootfs (24.04.14) noble; urgency=medium * When the files we're creating in the live layer have static content, diff --git a/live-build/apparmor/6.6/capability b/live-build/apparmor/6.6/capability new file mode 100644 index 00000000..96a10b97 --- /dev/null +++ b/live-build/apparmor/6.6/capability @@ -0,0 +1 @@ +0xffffff diff --git a/live-build/apparmor/6.6/caps/mask b/live-build/apparmor/6.6/caps/mask new file mode 100644 index 00000000..1bfa8eaf --- /dev/null +++ b/live-build/apparmor/6.6/caps/mask @@ -0,0 +1 @@ +chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap mac_override mac_admin syslog wake_alarm block_suspend audit_read perfmon bpf checkpoint_restore diff --git a/live-build/apparmor/6.6/dbus/mask b/live-build/apparmor/6.6/dbus/mask new file mode 100644 index 00000000..1248078e --- /dev/null +++ b/live-build/apparmor/6.6/dbus/mask @@ -0,0 +1 @@ +acquire send receive diff --git a/live-build/apparmor/6.6/domain/attach_conditions/xattr b/live-build/apparmor/6.6/domain/attach_conditions/xattr new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/domain/attach_conditions/xattr @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/domain/change_hat b/live-build/apparmor/6.6/domain/change_hat new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/domain/change_hat @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/domain/change_hatv b/live-build/apparmor/6.6/domain/change_hatv new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/domain/change_hatv @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/domain/change_onexec b/live-build/apparmor/6.6/domain/change_onexec new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/domain/change_onexec @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/domain/change_profile b/live-build/apparmor/6.6/domain/change_profile new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/domain/change_profile @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/domain/computed_longest_left b/live-build/apparmor/6.6/domain/computed_longest_left new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/domain/computed_longest_left @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/domain/fix_binfmt_elf_mmap b/live-build/apparmor/6.6/domain/fix_binfmt_elf_mmap new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/domain/fix_binfmt_elf_mmap @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/domain/post_nnp_subset b/live-build/apparmor/6.6/domain/post_nnp_subset new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/domain/post_nnp_subset @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/domain/stack b/live-build/apparmor/6.6/domain/stack new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/domain/stack @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/domain/version b/live-build/apparmor/6.6/domain/version new file mode 100644 index 00000000..5625e59d --- /dev/null +++ b/live-build/apparmor/6.6/domain/version @@ -0,0 +1 @@ +1.2 diff --git a/live-build/apparmor/6.6/file/mask b/live-build/apparmor/6.6/file/mask new file mode 100644 index 00000000..087b6771 --- /dev/null +++ b/live-build/apparmor/6.6/file/mask @@ -0,0 +1 @@ +create read write exec append mmap_exec link lock diff --git a/live-build/apparmor/6.6/io_uring/mask b/live-build/apparmor/6.6/io_uring/mask new file mode 100644 index 00000000..feffab83 --- /dev/null +++ b/live-build/apparmor/6.6/io_uring/mask @@ -0,0 +1 @@ +sqpoll override_creds diff --git a/live-build/apparmor/6.6/ipc/posix_mqueue b/live-build/apparmor/6.6/ipc/posix_mqueue new file mode 100644 index 00000000..c20f9f93 --- /dev/null +++ b/live-build/apparmor/6.6/ipc/posix_mqueue @@ -0,0 +1 @@ +create read write open delete setattr getattr diff --git a/live-build/apparmor/6.6/mount/mask b/live-build/apparmor/6.6/mount/mask new file mode 100644 index 00000000..652c8796 --- /dev/null +++ b/live-build/apparmor/6.6/mount/mask @@ -0,0 +1 @@ +mount umount pivot_root diff --git a/live-build/apparmor/6.6/namespaces/mask b/live-build/apparmor/6.6/namespaces/mask new file mode 100644 index 00000000..b0faec29 --- /dev/null +++ b/live-build/apparmor/6.6/namespaces/mask @@ -0,0 +1 @@ +userns_create diff --git a/live-build/apparmor/6.6/namespaces/pivot_root b/live-build/apparmor/6.6/namespaces/pivot_root new file mode 100644 index 00000000..7ecb56eb --- /dev/null +++ b/live-build/apparmor/6.6/namespaces/pivot_root @@ -0,0 +1 @@ +no diff --git a/live-build/apparmor/6.6/namespaces/profile b/live-build/apparmor/6.6/namespaces/profile new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/namespaces/profile @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/network/af_mask b/live-build/apparmor/6.6/network/af_mask new file mode 100644 index 00000000..d39f5b89 --- /dev/null +++ b/live-build/apparmor/6.6/network/af_mask @@ -0,0 +1 @@ +unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp diff --git a/live-build/apparmor/6.6/network/af_unix b/live-build/apparmor/6.6/network/af_unix new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/network/af_unix @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/network_v8/af_mask b/live-build/apparmor/6.6/network_v8/af_mask new file mode 100644 index 00000000..d39f5b89 --- /dev/null +++ b/live-build/apparmor/6.6/network_v8/af_mask @@ -0,0 +1 @@ +unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp diff --git a/live-build/apparmor/6.6/policy/outofband b/live-build/apparmor/6.6/policy/outofband new file mode 100644 index 00000000..2180fce5 --- /dev/null +++ b/live-build/apparmor/6.6/policy/outofband @@ -0,0 +1 @@ +0x000001 diff --git a/live-build/apparmor/6.6/policy/set_load b/live-build/apparmor/6.6/policy/set_load new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/policy/set_load @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/policy/versions/v5 b/live-build/apparmor/6.6/policy/versions/v5 new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/policy/versions/v5 @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/policy/versions/v6 b/live-build/apparmor/6.6/policy/versions/v6 new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/policy/versions/v6 @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/policy/versions/v7 b/live-build/apparmor/6.6/policy/versions/v7 new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/policy/versions/v7 @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/policy/versions/v8 b/live-build/apparmor/6.6/policy/versions/v8 new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/policy/versions/v8 @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/policy/versions/v9 b/live-build/apparmor/6.6/policy/versions/v9 new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/policy/versions/v9 @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/ptrace/mask b/live-build/apparmor/6.6/ptrace/mask new file mode 100644 index 00000000..10fc201a --- /dev/null +++ b/live-build/apparmor/6.6/ptrace/mask @@ -0,0 +1 @@ +read trace diff --git a/live-build/apparmor/6.6/query/label/data b/live-build/apparmor/6.6/query/label/data new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/query/label/data @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/query/label/multi_transaction b/live-build/apparmor/6.6/query/label/multi_transaction new file mode 100644 index 00000000..7cfab5b0 --- /dev/null +++ b/live-build/apparmor/6.6/query/label/multi_transaction @@ -0,0 +1 @@ +yes diff --git a/live-build/apparmor/6.6/query/label/perms b/live-build/apparmor/6.6/query/label/perms new file mode 100644 index 00000000..71685cbf --- /dev/null +++ b/live-build/apparmor/6.6/query/label/perms @@ -0,0 +1 @@ +allow deny audit quiet diff --git a/live-build/apparmor/6.6/rlimit/mask b/live-build/apparmor/6.6/rlimit/mask new file mode 100644 index 00000000..c305a7d2 --- /dev/null +++ b/live-build/apparmor/6.6/rlimit/mask @@ -0,0 +1 @@ +cpu fsize data stack core rss nproc nofile memlock as locks sigpending msgqueue nice rtprio rttime diff --git a/live-build/apparmor/6.6/signal/mask b/live-build/apparmor/6.6/signal/mask new file mode 100644 index 00000000..9eb55a04 --- /dev/null +++ b/live-build/apparmor/6.6/signal/mask @@ -0,0 +1 @@ +hup int quit ill trap abrt bus fpe kill usr1 segv usr2 pipe alrm term stkflt chld cont stop stp ttin ttou urg xcpu xfsz vtalrm prof winch io pwr sys emt lost diff --git a/live-build/auto/build b/live-build/auto/build index a0cec10f..5429a2fd 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -307,12 +307,13 @@ fi if [ "$PROJECT" = "ubuntu-cpc" ] || [ "$PROJECT" = "ubuntu-server" ]; then cat >> chroot/usr/local/sbin/unminimize <<'EOF' +# installing LXD using the lxd-installer by simply invoking it +echo "Invoking LXD so that it can be installed by the lxd-installer's script.." +lxd --version + echo "Removing lxd installer package..." apt-get purge -y lxd-installer -. /etc/os-release -echo "Installing lxd from snap from stable/ubuntu-$VERSION_ID channel" -snap install --channel="stable/ubuntu-$VERSION_ID" lxd EOF fi cat >> chroot/usr/local/sbin/unminimize <<'EOF' diff --git a/live-build/auto/config b/live-build/auto/config index 8024c53b..5729fae7 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -107,6 +107,31 @@ _register_pass () { # $1 Name of the pass [ "$PASSES_TO_LAYERS" != "true" ] && return + case "$PASSES" in + *$1*) + # The pass is already registered in the list of layers. + # If PASSES_TO_LAYERS is true, then the above if statement's error + # code will be non-zero and a return statement with no argument + # will return the error code of the if statement, non-zero, thus + # exiting the script and build. This is not our intent. So we need + # to return 0 here. + return 0 + ;; + esac + + # live-build/ubuntu/hooks/020-ubuntu-live.chroot_early assumes the + # layer ending in '.live' is THE live layer to use, so ensure that + # we only define a single layer ending in '.live'. It principle it + # is not invalid to have multiple layers with .live in the name but + # we should not let this happen accidentally. + case "$PASSES $1" in + *.live\ *.live) + echo "ERROR: only one 'live' layer allowed" + exit 1 + ;; + *) + ;; + esac PASSES="$PASSES $1" } diff --git a/live-build/functions b/live-build/functions index fe93c71f..bdd24b77 100644 --- a/live-build/functions +++ b/live-build/functions @@ -62,13 +62,26 @@ mount_image() { trap clean_loops EXIT backing_img="$1" local rootpart="$2" - loop_device=$(losetup --show -f -P -v ${backing_img}) + + # As explained in excruciating detail in LP: #2045586, "losetup + # -P" (a.k.a. --partscan) appears to race with udev in a way that + # prevents the device nodes for the partitions from being + # created. So instead we run losetup without -P, wait for udev to + # settle, then run partprobe and then settle udev again (which is + # probably unnecessary but at this point a bit more superstition + # can't hurt) + + loop_device=$(losetup --show -f -v ${backing_img}) if [ ! -b ${loop_device} ]; then echo "unable to find loop device for ${backing_img}" exit 1 fi + udevadm settle + partprobe ${loop_device} + udevadm settle + # Find the rootfs location rootfs_dev_mapper="${loop_device}p${rootpart}" if [ ! -b "${rootfs_dev_mapper}" ]; then diff --git a/live-build/ubuntu-server/hooks/01-unminimize.chroot_early b/live-build/ubuntu-server/hooks/01-unminimize.chroot_early index ec91fdc8..0d7ab5a4 100755 --- a/live-build/ubuntu-server/hooks/01-unminimize.chroot_early +++ b/live-build/ubuntu-server/hooks/01-unminimize.chroot_early @@ -10,14 +10,30 @@ case ${PASS} in ;; esac -# The unminimize script will try to install the lxd snap. We can't -# do that at this stage so just neuter the snap command (the snap +# The unminimize script will try to install the lxd snap using the shim script +# /usr/sbin/lxd from the lxd-installer package. +# We can't do that at this stage so just neuter the lxd command (the snap # will get properly seeded by generic machinery). -dpkg-divert --add --divert /usr/bin/snap.REAL --rename /usr/bin/snap -ln -s /bin/true /usr/bin/snap -yes | /usr/local/sbin/unminimize -rm /usr/bin/snap -dpkg-divert --remove --rename /usr/bin/snap +if [ -f "/usr/sbin/lxd" ]; then + dpkg-divert --add --divert /usr/sbin/lxd.REAL --rename /usr/sbin/lxd + ln -s /bin/true /usr/sbin/lxd + yes | /usr/local/sbin/unminimize + # unminimize also uninstalls lxd-installer package + # and also removed `/usr/sbin/lxd` as a result, so we don't need to restore, but + # we do need to remove the mock we used as part of dpkg-divert + # first we need to remove the diversion + dpkg-divert --remove --no-rename /usr/sbin/lxd + # now remove the renamed file that we originally diverted to + rm -v /usr/sbin/lxd.REAL +else + # if /usr/sbin/lxd doesn't exist then lxd-installer package isn't installed. + # Instead, we can mock the command to avoid the unminimize script failing + ln -s /bin/true /usr/sbin/lxd + yes | /usr/local/sbin/unminimize + # as the lxd-installer package was not installed and thus not removed by `unminimize` + # the mock /usr/sbin/lxd will still be present, so we need to remove it + rm -v /usr/sbin/lxd +fi # Fix up missing recommends. Other non-layered flavors handle this in # live-build/auto/build, but we need to do it here. Also, there are diff --git a/live-build/ubuntu/hooks/020-ubuntu-live.chroot_early b/live-build/ubuntu/hooks/020-ubuntu-live.chroot_early index 1894fcc5..7bbe2691 100755 --- a/live-build/ubuntu/hooks/020-ubuntu-live.chroot_early +++ b/live-build/ubuntu/hooks/020-ubuntu-live.chroot_early @@ -3,7 +3,7 @@ set -eu case ${PASS:-} in - minimal.standard.live) + *.live) ;; *) exit 0 @@ -14,4 +14,6 @@ cat < /etc/initramfs-tools/conf.d/default-layer.conf LAYERFS_PATH=${PASS}.squashfs EOF -glib-compile-schemas /usr/share/glib-2.0/schemas/ +if which glib-compile-schemas >/dev/null 2>&1; then + glib-compile-schemas /usr/share/glib-2.0/schemas/ +fi