[neon/neon/livecd-rootfs/Neon/release] live-build/auto: comment ou the mangle

Carlos De Maine null at kde.org
Mon Aug 5 23:35:24 BST 2024


Git commit b5d59449c61bcae4bbbf77da732321aa9a3d8925 by Carlos De Maine.
Committed on 05/08/2024 at 22:35.
Pushed by carlosdem into branch 'Neon/release'.

comment ou the mangle

M  +12   -12   live-build/auto/build

https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/b5d59449c61bcae4bbbf77da732321aa9a3d8925

diff --git a/live-build/auto/build b/live-build/auto/build
index f54f342c..de035655 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -449,18 +449,18 @@ Signed-By: /etc/apt/keyrings/preinstalled-pool.gpg
 			## Mangle binary ISO maindir to contain cdrom repo.
 			## But only if the installer is Ubiquity, Calamares has special code
 			## to clean up the preinstalled repo after installation.
-			if [ -e chroot/usr/bin/ubiquity ]; then
-				mkdir -p binary/.disk/ || true
-				echo full_cd/single > binary/.disk/cd_type
-
-				rm -rf binary/dists/
-				mv chroot/var/lib/preinstalled-pool/dists binary/
-				rm -rf binary/pool/
-				mv chroot/var/lib/preinstalled-pool/pool binary/
-
-				rm chroot/etc/apt/sources.list.d/preinstalled-pool.list
-				rm -r chroot/var/lib/preinstalled-pool/
-			fi
+			#if [ -e chroot/usr/bin/ubiquity ]; then
+			#	mkdir -p binary/.disk/ || true
+			#	echo full_cd/single > binary/.disk/cd_type
+
+			#	rm -rf binary/dists/
+			#	mv chroot/var/lib/preinstalled-pool/dists binary/
+			#	rm -rf binary/pool/
+			#	mv chroot/var/lib/preinstalled-pool/pool binary/
+
+			#	rm chroot/etc/apt/sources.list.d/preinstalled-pool.list
+			#	rm -r chroot/var/lib/preinstalled-pool/
+			#fi
 			## End of mangle
 
 			# We only want to have a cache for the pre-installed pool at this point


More information about the Neon-commits mailing list