summaryrefslogtreecommitdiff
path: root/helpers/lh_chroot_hacks
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:04:47 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:18:28 +0100
commit677415f6d7efc1e5b888570d70af311d2900c69c (patch)
tree32fe7ced768666c229fff913fe12cbbf2fdd34e4 /helpers/lh_chroot_hacks
parent811ff0532fcb3305ebefcd1d61e4eb6c260902eb (diff)
downloadlive-build-677415f6d7efc1e5b888570d70af311d2900c69c.zip
live-build-677415f6d7efc1e5b888570d70af311d2900c69c.tar.gz
Adding live-helper 1.0~a2-1.
Diffstat (limited to 'helpers/lh_chroot_hacks')
-rwxr-xr-xhelpers/lh_chroot_hacks18
1 files changed, 9 insertions, 9 deletions
diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index d46e0c5..2b08283 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -16,16 +16,16 @@ Read_conffile config/chroot
Set_defaults
# Requiring stage file
-Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap
+Require_stagefile .stage/bootstrap
# Checking stage file
-Check_stagefile "${LIVE_ROOT}"/.stage/chroot_hacks
+Check_stagefile .stage/chroot_hacks
# Checking lock file
-Check_lockfile "${LIVE_ROOT}"/.lock
+Check_lockfile .lock
# Creating lock file
-Create_lockfile "${LIVE_ROOT}"/.lock
+Create_lockfile .lock
# Removing udev mac caching rule
rm -f chroot/etc/udev/rules.d/z25_persistent-net.rules
@@ -33,7 +33,7 @@ rm -f chroot/etc/udev/rules.d/z25_persistent-net.rules
case "${LIVE_BINARY_IMAGE}" in
net)
case "${LH_APT}" in
- apt)
+ apt|apt-get)
Chroot "apt-get install --yes smbfs"
;;
@@ -42,13 +42,13 @@ case "${LIVE_BINARY_IMAGE}" in
;;
esac
- if [ ! -d "${LIVE_CHROOT}"/etc/initramfs-tools ]
+ if [ ! -d chroot/etc/initramfs-tools ]
then
- mkdir "${LIVE_CHROOT}"/etc/initramfs-tools
+ mkdir chroot/etc/initramfs-tools
fi
# Configuring initramfs for NFS
-cat >> "${LIVE_CHROOT}"/etc/initramfs-tools/initramfs.conf << EOF
+cat >> chroot/etc/initramfs-tools/initramfs.conf << EOF
MODULES=netboot
BOOT=nfs
NFSROOT=auto
@@ -60,4 +60,4 @@ esac
Chroot "update-initramfs -tu"
# Creating stage file
-Create_stagefile "${LIVE_ROOT}"/.stage/chroot_hacks
+Create_stagefile .stage/chroot_hacks