[Debian-live-changes] r1811 - in dists/trunk/live-helper: docs helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-27 19:50:46 +0000 (Sun, 27 May 2007)
New Revision: 1811

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary_rootfs
   dists/trunk/live-helper/helpers/lh_config
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-05-27 19:09:20 UTC (rev 1810)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-05-27 19:50:46 UTC (rev 1811)
@@ -1,3 +1,9 @@
+2007-05-27  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_rootfs:
+	  - Added check for config/binary_rootfs/squashfs.sort for passing a
+	    sorting list to mksquashfs.
+
 2007-05-26  Daniel Baumann  <daniel at debian.org>
 
 	* lists/rescue:

Modified: dists/trunk/live-helper/helpers/lh_binary_rootfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-05-27 19:09:20 UTC (rev 1810)
+++ dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-05-27 19:50:46 UTC (rev 1811)
@@ -127,12 +127,18 @@
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
 		fi
 
+		if [ -f config/binary_rootfs/squashfs.sort ]
+		then
+			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -sort squashfs.sort"
+			cp config/binary_rootfs/squashfs.sort chroot
+		fi
+
 		# Create image
 		Chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
 
 		# Move image
 		${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS}
-		${LH_ROOT_COMMAND} rm -rf chroot/chroot
+		${LH_ROOT_COMMAND} rm -rf chroot/chroot chroot/squashfs.sort
 
 		if [ -n "${LH_ROOT_COMMAND}" ]
 		then

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-05-27 19:09:20 UTC (rev 1810)
+++ dists/trunk/live-helper/helpers/lh_config	2007-05-27 19:50:46 UTC (rev 1811)
@@ -282,6 +282,7 @@
 # Creating lh_binary_* configuration
 mkdir -p "${LIVE_ROOT}"/config/binary_grub
 mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
+mkdir -p "${LIVE_ROOT}"/config/binary_rootfs
 mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
 
 cat > "${LIVE_ROOT}"/config/binary << EOF