[SCM] debian-live/live-helper branch, master, updated. 1.0_a34-1-4-ge7100f4

[Jesse Hathaway]

The branch, master has been updated
       via  e7100f46b8e616f200845bc644f1d1f881ceceb8 (commit)
       via  800687e9ba9cc4cd476937bfc0da172d50bd58b8 (commit)
       via  ae8cb3bce02962693c52019eba0a14748cad5416 (commit)
      from  1385ab552699c98c776621026e8c1d4084fd4774 (commit)


- Shortlog ------------------------------------------------------------
e7100f4 add /etc/adjtime to list of writable files in exposed root mode
800687e allow basename of net-root-path to be binary
ae8cb3b add force flag when removing /etc/mtab for exposedroot mode

Summary of changes:
 helpers/lh_binary_net   |   17 ++++++++++++-----
 helpers/lh_chroot_hacks |    4 ++--
 2 files changed, 14 insertions(+), 7 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit e7100f46b8e616f200845bc644f1d1f881ceceb8
Author: Jesse Hathaway <jesse at mbuki-mvuki.org>
Date:   Wed Oct 31 10:18:12 2007 -0400

    add /etc/adjtime to list of writable files in exposed root mode

diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index 7df2cdc..aa5652d 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -127,7 +127,7 @@ then
 
 	# Config files which need to be RW
 	CONFIG_FILES='/etc/hostname /etc/hosts /etc/resolv.conf /etc/fstab
-		/etc/live.conf /etc/network/interfaces /etc/X11/xorg.conf
+		/etc/live.conf /etc/network/interfaces /etc/X11/xorg.conf /etc/adjtime
 		/etc/udev/rules.d/z25_persistent-net.rules
 		/etc/udev/rules.d/z25_persistent-cd.rules'
 

commit 800687e9ba9cc4cd476937bfc0da172d50bd58b8
Author: Jesse Hathaway <jesse at mbuki-mvuki.org>
Date:   Wed Oct 31 09:59:01 2007 -0400

    allow basename of net-root-path to be binary
    
    This is convenient for testing as you can directly export
    the build directory, rather than untarring the net image
    in another location.

diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net
index 8c61bce..3eb8b67 100755
--- a/helpers/lh_binary_net
+++ b/helpers/lh_binary_net
@@ -59,21 +59,28 @@ then
 fi
 
 # Creating image file
-if [ "$(basename ${LH_NET_ROOT_PATH})" = "chroot" ]
+ROOT_DIR=$(basename ${LH_NET_ROOT_PATH})
+if [ "${ROOT_DIR}" = "chroot" ]
 then
 	mv chroot chroot.tmp
 fi
 
-mv binary "$(basename ${LH_NET_ROOT_PATH})"
+if [ "${ROOT_DIR}" != "binary" ]
+then
+	mv binary ${ROOT_DIR}
+fi
 
 cd ..
-tar cfz binary-net.tar.gz "$(basename ${OLDPWD})/$(basename ${LH_NET_ROOT_PATH})" "$(basename ${OLDPWD})/tftpboot"
+tar cfz binary-net.tar.gz "$(basename ${OLDPWD})/${ROOT_DIR}" "$(basename ${OLDPWD})/tftpboot"
 mv binary-net.tar.gz "${OLDPWD}"
 cd "${OLDPWD}"
 
-mv "$(basename ${LH_NET_ROOT_PATH})" binary
+if [ "${ROOT_DIR}" != "binary" ]
+then
+	mv ${ROOT_DIR} binary
+fi
 
-if [ "$(basename ${LH_NET_ROOT_PATH})" = "chroot" ]
+if [ "${ROOT_DIR}" = "chroot" ]
 then
 	mv chroot.tmp chroot
 fi

commit ae8cb3bce02962693c52019eba0a14748cad5416
Author: Jesse Hathaway <jesse at mbuki-mvuki.org>
Date:   Tue Oct 30 17:03:44 2007 -0400

    add force flag when removing /etc/mtab for exposedroot mode
    
    cdebootstrap does not create /etc/mtab

diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index 8c08d55..7df2cdc 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -150,7 +150,7 @@ then
 
 	# Mount doesn't write to a symlink so use /proc/mounts instead,
 	# see debian bug #154438 for more info
-	rm chroot/etc/mtab
+	rm -f chroot/etc/mtab
 	ln -s /proc/mounts chroot/etc/mtab
 fi
 

-- 
debian-live/live-helper