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

No need to use rsync in hooks now to avoid file duplication since layer handling as a whole now uses rsync.

Browse Source
This commit is contained in:
Steve Langasek 2023-08-22 11:55:02 -07:00 committed by Michael Hudson-Doyle
parent b43e3b84f4
commit 2b80fdecd2
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -8,6 +8,8 @@ livecd-rootfs (23.10.21) UNRELEASED; urgency=medium
- Consolidate canary layers to merge 'classic' back into 'standard' - Consolidate canary layers to merge 'classic' back into 'standard'
- Reset /var/lib/snapd in the upper layers before calling snap - Reset /var/lib/snapd in the upper layers before calling snap
prepare-image prepare-image
- No need to use rsync in hooks now to avoid file duplication since layer
handling as a whole now uses rsync.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 23 Aug 2023 11:15:26 +1200 -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 23 Aug 2023 11:15:26 +1200

4
live-build/ubuntu/hooks/020-canary-enhanced-sb.binary
View File

@ -141,5 +141,5 @@ reset_snapd_state chroot
env SNAPPY_STORE_NO_CDN=1 snap prepare-image \ env SNAPPY_STORE_NO_CDN=1 snap prepare-image \
--classic config/classic-model.model $channel chroot --classic config/classic-model.model $channel chroot
mv chroot/system-seed/systems/* chroot/system-seed/systems/enhanced-secureboot-desktop mv chroot/system-seed/systems/* chroot/system-seed/systems/enhanced-secureboot-desktop
rsync -a chroot/system-seed/ chroot/var/lib/snapd/seed rm -rf chroot/var/lib/snapd/seed
rm -rf chroot/system-seed/ mv chroot/system-seed chroot/var/lib/snapd/seed

4
live-build/ubuntu/hooks/020-canary-live.binary
View File

@ -137,8 +137,8 @@ reset_snapd_state chroot
env SNAPPY_STORE_NO_CDN=1 snap prepare-image \ env SNAPPY_STORE_NO_CDN=1 snap prepare-image \
--classic config/classic-model-installer.model $channel chroot --classic config/classic-model-installer.model $channel chroot
mv chroot/system-seed/systems/* chroot/system-seed/systems/classic-installer mv chroot/system-seed/systems/* chroot/system-seed/systems/classic-installer
rsync -a chroot/system-seed/ chroot/var/lib/snapd/seed rm -rf chroot/var/lib/snapd/seed
rm -rf chroot/system-seed/ mv chroot/system-seed chroot/var/lib/snapd/seed
cat <<EOF > chroot/var/lib/snapd/modeenv cat <<EOF > chroot/var/lib/snapd/modeenv
mode=run mode=run