Adding debian version 4.0~a1-1.debian/4.0_a1-1

1 files changed, 30 insertions, 49 deletions

diff --git a/scripts/build/binary_loadlin b/scripts/build/binary_loadlin
index 29f926d22..1e6a10e0c 100755
--- a/scripts/build/binary_loadlin
+++ b/scripts/build/binary_loadlin
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LB_LOADLIN}" != "true" ] || [ "${LB_BINARY_IMAGES}" = "netboot" ]
+if [ "${LB_LOADLIN}" != "true" ]
 then
 	exit 0
 fi
@@ -45,58 +45,39 @@ Create_lockfile .lock
 
 case "${LB_ARCHITECTURES}" in
 	amd64|i386)
-		case "${LB_BUILD_WITH_CHROOT}" in
-			true)
-				# Checking depends
-				Check_package chroot/usr/lib/loadlin/loadlin.exe.gz loadlin
-
-				# Restoring cache
-				Restore_cache cache/packages.binary
-
-				# Installing depends
-				Install_package
-
-				_PREFIX="chroot"
-				;;
-
-			false)
-				_PREFIX=""
-				;;
-		esac
-
-		# Copying loadlin
-		mkdir -p binary/tools
-		gunzip -c "${_PREFIX}/usr/lib/loadlin/loadlin.exe.gz" > binary/tools/loadlin.exe
-		gunzip -c "${_PREFIX}/usr/share/doc/loadlin/manual.txt.gz" > binary/tools/loadlin.txt
-
-		case "${LB_BUILD_WITH_CHROOT}" in
-			true)
-				# Saving cache
-				Save_cache cache/packages.binary
-
-				# Removing depends
-				Remove_package
-				;;
-		esac
-
-cat > binary/install/install.bat << EOF
-\tools\loadlin.exe vmlinuz initrd=initrd.gz
-EOF
-
-		if [ -e binary/install/gtk ]
+		if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
 		then
-
-cat > binary/install/gtk/install.bat << EOF
-\tools\loadlin.exe \install\vmlinuz initrd=initrd.gz vga=788
-EOF
-
+			# Checking depends
+			Check_package chroot/usr/lib/loadlin/loadlin.exe.gz loadlin
+
+			# Restoring cache
+			Restore_cache cache/packages.binary
+
+			# Installing depends
+			Install_package
+
+			# Copying loadlin
+			mkdir -p binary/tools
+			gunzip -c chroot/usr/lib/loadlin/loadlin.exe.gz > binary/tools/loadlin.exe
+			gunzip -c chroot/usr/share/doc/loadlin/manual.txt.gz > binary/tools/loadlin.txt
+
+			# Saving cache
+			Save_cache cache/packages.binary
+
+			# Removing depends
+			Remove_package
+		else
+			# Copying loadlin
+			mkdir -p binary/tools
+			gunzip -c /usr/lib/loadlin/loadlin.exe.gz > binary/tools/loadlin.exe
+			gunzip -c /usr/share/doc/loadlin/manual.txt.gz > binary/tools/loadlin.txt
 		fi
-
-		# Creating stage file
-		Create_stagefile .build/binary_loadlin
 		;;
 
 	*)
 		Echo_warning "loadlin inclusion is set to true but not compatible with your architecture, ignoring."
 		;;
 esac
+
+# Creating stage file
+Create_stagefile .build/binary_loadlin