Adding live-helper 1.0~a3-1.

1 files changed, 26 insertions, 14 deletions

diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net
index 7d657c919..4a2a20dd4 100755
--- a/helpers/lh_binary_net
+++ b/helpers/lh_binary_net
@@ -1,6 +1,11 @@
 #!/bin/sh
 
 # lh_binary_net(1) - build netboot binary image
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
 
 set -e
 
@@ -10,28 +15,35 @@ do
 	. ${FUNCTION}
 done
 
+# Set static variables
+DESCRIPTION="build netboot binary image"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
 Read_conffile config/image
 Set_defaults
 
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking stage file
-Check_stagefile .stage/binary_net
-
 for IMAGE in ${LIVE_BINARY_IMAGE}
 do
 	if [ "${IMAGE}" = "net" ]
 	then
+		# Requiring stage file
+		Require_stagefile .stage/bootstrap
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		# Checking stage file
+		Check_stagefile .stage/binary_net
+
 		# Remove old binary
 		if [ -f binary-net.tar.gz ]
 		then
@@ -42,8 +54,8 @@ do
 		mv binary "`basename ${LIVE_SERVER_PATH}`"
 
 		cd ..
-		tar cfz binary-net.tar.gz "${LIVE_ROOT}/`basename ${LIVE_SERVER_PATH}`" "${LIVE_ROOT}/tftpboot"
-		mv binary-net.tar.gz "${LIVE_ROOT}"
+		tar cfz binary-net.tar.gz "${OLDPWD}/`basename ${LIVE_SERVER_PATH}`" "${OLDPWD}/tftpboot"
+		mv binary-net.tar.gz "${OLDPWD}"
 		cd "${OLDPWD}"
 
 		mv "`basename ${LIVE_SERVER_PATH}`" binary