diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:05:17 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:26 +0100 |
| commit | 0d0de885e32ff67d57bb7def451b62d75b8920ab (patch) | |
| tree | cd4a159a86207401dbd5990bc0fa3c28825ab6f8 /helpers/lh_chroot_hacks | |
| parent | c68c0a270832ca340429878ce6a0ab606d435b06 (diff) | |
| download | vyos-live-build-0d0de885e32ff67d57bb7def451b62d75b8920ab.tar.gz vyos-live-build-0d0de885e32ff67d57bb7def451b62d75b8920ab.zip | |
Adding live-helper 1.0~a22-1.
Diffstat (limited to 'helpers/lh_chroot_hacks')
| -rwxr-xr-x | helpers/lh_chroot_hacks | 12 |
1 files changed, 9 insertions, 3 deletions
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 |