Splitting out win32-loader handling into own helper script.

3 files changed, 57 insertions, 15 deletions

diff --git a/helpers/lh_binary b/helpers/lh_binary
index 30d241442..470cae0f8 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -58,6 +58,7 @@ lh_binary_syslinux ${*}
 lh_binary_yaboot ${*}
 lh_binary_silo ${*}
 lh_binary_disk ${*}
+lh_binary_win32-loader ${*}
 lh_binary_includes ${*}
 lh_binary_local-includes ${*}
 lh_binary_local-hooks ${*}
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index eefa31acc..e37cc6190 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -159,20 +159,5 @@ then
 	sed -i -e "s|DEBIAN_NAME|${DEBIAN_NAME}|g" -e "s|DEBIAN_DATE|${DEBIAN_DATE}|g" -e "s|DEBIAN_TOOLS|${DEBIAN_TOOLS_TXT}|g" binary/README.txt
 fi
 
-# Copying win32-loader
-if [ "${LH_WIN32_LOADER}" = "enabled" ]
-then
-	case "${LH_ARCHITECTURE}" in
-		amd64|i386)
-			if Find_files /usr/lib/win32-loader/*
-			then
-				cp /usr/lib/win32-loader/* binary
-			else
-				Echo_warning "win32-loader inclusion is enabled but not found, ignoring."
-			fi
-		;;
-	esac
-fi
-
 # Creating stage file
 Create_stagefile .stage/binary_includes
diff --git a/helpers/lh_binary_win32-loader b/helpers/lh_binary_win32-loader
new file mode 100755
index 000000000..c9f891086
--- /dev/null
+++ b/helpers/lh_binary_win32-loader
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# lh_binary_win32-loader(1) - copy win32-loader into binary
+# Copyright (C) 2006-2009 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
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/functions.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'copy win32-loader into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin copying win32-loader..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_win32-loader
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Copying win32-loader
+if [ "${LH_WIN32_LOADER}" = "enabled" ]
+then
+	case "${LH_ARCHITECTURE}" in
+		amd64|i386)
+			if Find_files /usr/lib/win32-loader/*
+			then
+				cp /usr/lib/win32-loader/* binary
+			else
+				Echo_warning "win32-loader inclusion is enabled but not found, ignoring."
+			fi
+		;;
+	esac
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_win32-loader