From 677415f6d7efc1e5b888570d70af311d2900c69c Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:04:47 +0200
Subject: Adding live-helper 1.0~a2-1.

---
 helpers/lh_binary_linuximage | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'helpers/lh_binary_linuximage')

diff --git a/helpers/lh_binary_linuximage b/helpers/lh_binary_linuximage
index d332c53b0..7a9576d96 100755
--- a/helpers/lh_binary_linuximage
+++ b/helpers/lh_binary_linuximage
@@ -16,32 +16,32 @@ Read_conffile config/image
 Set_defaults
 
 # Requiring stage file
-Require_stagefile "${LIVE_ROOT}"/.stage/bootstrap
+Require_stagefile .stage/bootstrap
 
 # Checking lock file
-Check_lockfile "${LIVE_ROOT}"/.lock
+Check_lockfile .lock
 
 # Creating lock file
-Create_lockfile "${LIVE_ROOT}"/.lock
+Create_lockfile .lock
 
 # Checking stage file
-Check_stagefile "${LIVE_ROOT}"/.stage/binary_linuximage
+Check_stagefile .stage/binary_linuximage
 
 # Removing initrd backup files
-rm -f "${LIVE_CHROOT}"/boot/initrd*bak*
+rm -f chroot/boot/initrd*bak*
 
 # Setting destination directory
 case "${LIVE_BINARY_IMAGE}" in
 	iso)
-		DESTDIR="${LIVE_ROOT}/binary/isolinux"
+		DESTDIR="binary/isolinux"
 		;;
 
 	net)
-		DESTDIR="${LIVE_ROOT}/tftpboot"
+		DESTDIR="tftpboot"
 		;;
 
-	usb)
-		DESTDIR="${LIVE_ROOT}/binary"
+	usb|hdd)
+		DESTDIR="binary"
 		;;
 esac
 
@@ -52,8 +52,8 @@ then
 fi
 
 # Installing linux-image
-cp "${LIVE_CHROOT}"/boot/vmlinuz* "${DESTDIR}"/vmlinuz
-cp "${LIVE_CHROOT}"/boot/initrd.img* "${DESTDIR}"/initrd.gz
+cp chroot/boot/vmlinuz* "${DESTDIR}"/vmlinuz
+cp chroot/boot/initrd.img* "${DESTDIR}"/initrd.gz
 
 # Creating stage file
-Create_stagefile "${LIVE_ROOT}"/.stage/binary_linuximage
+Create_stagefile .stage/binary_linuximage
-- 
cgit v1.2.3