From 2b80fdecd2d3528bc9da82a12a84cf05389e644b Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 22 Aug 2023 11:55:02 -0700 Subject: [PATCH] No need to use rsync in hooks now to avoid file duplication since layer handling as a whole now uses rsync. --- debian/changelog | 2 ++ live-build/ubuntu/hooks/020-canary-enhanced-sb.binary | 4 ++-- live-build/ubuntu/hooks/020-canary-live.binary | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index cc092c15..0bfdcabc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ livecd-rootfs (23.10.21) UNRELEASED; urgency=medium - Consolidate canary layers to merge 'classic' back into 'standard' - Reset /var/lib/snapd in the upper layers before calling snap 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 Wed, 23 Aug 2023 11:15:26 +1200 diff --git a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary index 0beffc23..8e1f6239 100644 --- a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary +++ b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary @@ -141,5 +141,5 @@ reset_snapd_state chroot env SNAPPY_STORE_NO_CDN=1 snap prepare-image \ --classic config/classic-model.model $channel chroot 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/system-seed/ +rm -rf chroot/var/lib/snapd/seed +mv chroot/system-seed chroot/var/lib/snapd/seed diff --git a/live-build/ubuntu/hooks/020-canary-live.binary b/live-build/ubuntu/hooks/020-canary-live.binary index 40e630dd..955e738d 100755 --- a/live-build/ubuntu/hooks/020-canary-live.binary +++ b/live-build/ubuntu/hooks/020-canary-live.binary @@ -137,8 +137,8 @@ reset_snapd_state chroot env SNAPPY_STORE_NO_CDN=1 snap prepare-image \ --classic config/classic-model-installer.model $channel chroot mv chroot/system-seed/systems/* chroot/system-seed/systems/classic-installer -rsync -a chroot/system-seed/ chroot/var/lib/snapd/seed -rm -rf chroot/system-seed/ +rm -rf chroot/var/lib/snapd/seed +mv chroot/system-seed chroot/var/lib/snapd/seed cat < chroot/var/lib/snapd/modeenv mode=run