Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-16 05:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.612

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2019-09-16 17:00:05 +00:00
parent 28fb8de9ea
commit 37e3490825
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.612) eoan; urgency=medium
* Hopefully the last fix for 999-ubuntu-image-customization.chroot: use
config/chroot to pass IMAGEFORMAT instead of config/common, as only that
file is updated with the right contents when the chroot hooks are run.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Mon, 16 Sep 2019 14:07:01 +0200
livecd-rootfs (2.611) eoan; urgency=medium livecd-rootfs (2.611) eoan; urgency=medium
* Execute chroot_hacks in live layer only. * Execute chroot_hacks in live layer only.

1
live-build/auto/config
View File

@ -974,6 +974,7 @@ fi
echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot
echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/chroot echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/chroot
echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/chroot echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/chroot
echo "IMAGEFORMAT=\"$IMAGEFORMAT\"" >> config/chroot
if [ -n "$PASSES" ]; then if [ -n "$PASSES" ]; then
echo "PASSES=\"$PASSES\"" >> config/common echo "PASSES=\"$PASSES\"" >> config/common
fi fi

2
live-build/ubuntu-cpc/hooks.d/chroot/999-ubuntu-image-customization.chroot
View File

@ -1,6 +1,6 @@
#!/bin/bash -ex #!/bin/bash -ex
. /root/config/common . /root/config/chroot
# Specific ubuntu-image chroot configuration goes here. # Specific ubuntu-image chroot configuration goes here.
# Currently the ubuntu-image IMAGEFORMAT is equivalent to building an image # Currently the ubuntu-image IMAGEFORMAT is equivalent to building an image