From 0d0de885e32ff67d57bb7def451b62d75b8920ab Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 23 Sep 2007 10:05:17 +0200 Subject: Adding live-helper 1.0~a22-1. --- helpers/lh_chroot_hacks | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'helpers/lh_chroot_hacks') diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks index cc9b4319f..a8ee98979 100755 --- a/helpers/lh_chroot_hacks +++ b/helpers/lh_chroot_hacks @@ -49,7 +49,7 @@ Create_lockfile .lock # Removing udev mac caching rule Chroot "rm -f /etc/udev/rules.d/z25_persistent-net.rules" -case "${LIVE_BINARY_IMAGES}" in +case "${LH_BINARY_IMAGES}" in net) if [ ! -f chroot/usr/bin/smbmount ] then @@ -80,6 +80,12 @@ EOF ;; esac +# Remove resume +if [ "${LH_DISTRIBUTION}" = "etch" ] && [ -e /etc/initramfs-tools/conf.d/resume ] +then + rm -f /etc/initramfs-tools/conf.d/resume +fi + # Update initramfs Chroot "update-initramfs -k all -t -u" @@ -99,9 +105,9 @@ then ${LH_ROOT_COMMAND} chown -R --quiet `whoami`:`whoami` chroot fi -if [ -d chroot/home/${LIVE_USERNAME} ] +if [ -d chroot/home/${LH_USERNAME} ] then - chown -R --quiet 999:999 chroot/home/${LIVE_USERNAME} + chown -R --quiet 999:999 chroot/home/${LH_USERNAME} fi # Creating stage file -- cgit v1.2.3