refresh patches against Debian's 3.0~b6-1

the following patches are obsolete and will be droped: 30_support_multiarch_dns.patch 38_do_not_check_for_forensic_in_readonly_mode.patch 35_fix_findiso_umount.patch
grml · Dec 4, 2012 · ce765d3 · ce765d3
1 parent 76af481
commit ce765d3
Show file tree

Hide file tree

Showing 24 changed files with 235 additions and 318 deletions.
diff --git a/debian/patches/03_grml_version_file_hook.patch b/debian/patches/03_grml_version_file_hook.patch
@@ -6,18 +6,18 @@
 
 @DPATCH@
 
---- a/hooks/live
-+++ b/hooks/live
-@@ -40,6 +40,12 @@
- 	done
- fi
+--- a/backends/initramfs-tools/live.hook
++++ b/backends/initramfs-tools/live.hook
+@@ -16,6 +16,12 @@ do
+ 	fi
+ done
 
 +# Grml version information:
 +if [ -r /etc/grml_version ]
 +then
 +       cp /etc/grml_version "${DESTDIR}"/etc
 +fi
 +
- # Handling live-boot
-
- if [ ! -e /usr/share/live-boot ]
+ # Checking live-boot
+ if [ ! -e /lib/live/boot ]
+ then
diff --git a/debian/patches/05_boot_failure_message_grml.patch b/debian/patches/05_boot_failure_message_grml.patch
@@ -6,9 +6,9 @@
 
 @DPATCH@
 
---- a/scripts/live-functions
-+++ b/scripts/live-functions
-@@ -88,14 +88,20 @@
+--- a/scripts/boot/9990-initramfs-tools.sh
++++ b/scripts/boot/9990-initramfs-tools.sh
+@@ -44,14 +44,20 @@
  	printf "     ${DEB_1}\n"
  	printf "     ${DEB_2}  \033[1;37mBOOT FAILED!\033[0m\n"
  	printf "     ${DEB_3}\n"

diff --git a/debian/patches/08_grml_defaults.patch b/debian/patches/08_grml_defaults.patch
@@ -5,9 +5,9 @@
 ## DP: Pseudo-brand as grml
 
 @DPATCH@
---- a/scripts/live
-+++ b/scripts/live
-@@ -11,7 +11,7 @@
+--- a/scripts/boot/9990-aaa-fixme.sh
++++ b/scripts/boot/9990-aaa-fixme.sh
+@@ -9,7 +9,7 @@
  alt_mountpoint="/media"
  LIVE_MEDIA_PATH="live"
 

diff --git a/debian/patches/11_dhcphostname.patch b/debian/patches/11_dhcphostname.patch
@@ -11,17 +11,17 @@ Support 'nodhcphostname' option which will disable setting the
 hostname of the booted system according to the DNS information.
 This patch takes care of the netboot case.
 
---- a/scripts/live-helpers
-+++ b/scripts/live-helpers
-@@ -202,6 +202,11 @@
- 				export NOACCESSIBILITY
+--- a/scripts/boot/9990-cmdline-old
++++ b/scripts/boot/9990-cmdline-old
+@@ -140,6 +140,11 @@ Cmdline_old ()
+ 				export NFS_COW
  				;;
 
 +			nodhcphostname)
 +				NODHCPHOSTNAME="Yes"
 +				export NODHCPHOSTNAME
 +				;;
 +
- 			nofastboot)
- 				NOFASTBOOT="Yes"
- 				export NOFASTBOOT
+ 			nofstab)
+ 				NOFSTAB="true"
+ 				export NOFSTAB
diff --git a/debian/patches/12_uuid_support.patch b/debian/patches/12_uuid_support.patch
@@ -12,8 +12,8 @@
 ## DP: * no bootid.txt + ignore_bootid=...                => boots
 
 @DPATCH@
---- a/scripts/live
-+++ b/scripts/live
+--- a/scripts/boot/9990-misc-helpers.sh
++++ b/scripts/boot/9990-misc-helpers.sh
 @@ -52,6 +52,42 @@
  	return 1
  }
@@ -86,21 +86,21 @@
  		fi
  	done
 
---- a/scripts/live-helpers
-+++ b/scripts/live-helpers
-@@ -45,6 +45,11 @@
- 				export ACCESS
+--- a/scripts/boot/9990-cmdline-old
++++ b/scripts/boot/9990-cmdline-old
+@@ -18,6 +18,11 @@
+ 				BOOTIF="${x#BOOTIF=}"
  				;;
 
 +			bootid=*)
-+				BOOTID="${ARGUMENT#bootid=}"
++				BOOTID="${_PARAMETER#bootid=}"
 +				export BOOTID
 +				;;
 +
- 			console=*)
- 				DEFCONSOLE="${ARGUMENT#*=}"
- 				export DEFCONSOLE
-@@ -126,6 +131,11 @@
+ 			dhcp)
+ 				# Force dhcp even while netbooting
+ 				# Use for debugging in case somebody works on fixing dhclient
+@@ -79,6 +84,11 @@
  				export FROMISO
  				;;
 
@@ -110,5 +110,5 @@
 +				;;
 +
  			ignore_uuid)
- 				IGNORE_UUID="Yes"
+ 				IGNORE_UUID="true"
  				export IGNORE_UUID
diff --git a/debian/patches/13_always_display_warnings_and_failures.patch b/debian/patches/13_always_display_warnings_and_failures.patch
@@ -5,13 +5,13 @@
 ## DP: Always display failure and warning messages.
 
 @DPATCH@
-Index: b/scripts/live-functions
+Index: live-boot-grml/scripts/boot/9990-initramfs-tools.sh
 ===================================================================
---- a/scripts/live-functions	2011-07-24 22:07:56.000000000 +0200
-+++ b/scripts/live-functions	2011-07-24 22:08:04.000000000 +0200
+--- live-boot-grml.orig/scripts/boot/9990-initramfs-tools.sh	2012-11-28 08:10:50.815614786 +0100
++++ live-boot-grml/scripts/boot/9990-initramfs-tools.sh	2012-11-28 08:25:12.864563943 +0100
 @@ -2,6 +2,17 @@
- . /scripts/functions
- . /live.vars
+
+ #set -e
 
 +# we definitely want this stuff visible
 +log_failure_msg()

diff --git a/debian/patches/15_networking_grml.patch b/debian/patches/15_networking_grml.patch
@@ -10,29 +10,13 @@
 
 diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_grml
 --- /dev/null
-+++ b/scripts/live-bottom/23networking_grml
-@@ -0,0 +1,107 @@
++++ b/scripts/boot/9990-grml-networking.sh
+@@ -0,0 +1,93 @@
 +#!/bin/sh
 +
 +#set -e
 +
-+# initramfs-tools header
-+
-+PREREQ=""
-+
-+prereqs()
-+{
-+   echo "${PREREQ}"
-+}
-+
-+case "${1}" in
-+   prereqs)
-+      prereqs
-+      exit 0
-+   ;;
-+esac
-+
-+. /scripts/live-functions
++Grml_Networking () {
 +
 +if [ -n "${NONETWORKING}" ]; then
 +   exit 0
@@ -119,3 +103,18 @@ diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_
 +
 +    echo>> $IFFILE
 +done
++
++}
+diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
+index ef41fb0..2af5eb6 100755
+--- a/scripts/boot/9990-main.sh
++++ b/scripts/boot/9990-main.sh
+@@ -194,6 +194,8 @@ Main ()
+ 
+ 	Swap
+ 
++	Grml_Networking
++
+ 	case "${UNIONFS}" in
+ 		unionfs-fuse)
+ 			umount "${rootmnt}/dev"
diff --git a/debian/patches/16_nodhcp.patch b/debian/patches/16_nodhcp.patch
@@ -6,12 +6,12 @@
 
 @DPATCH@
 
---- a/scripts/live-helpers
-+++ b/scripts/live-helpers
-@@ -75,6 +75,8 @@
-
+--- a/scripts/boot/9990-cmdline-old
++++ b/scripts/boot/9990-cmdline-old
+@@ -28,6 +28,8 @@
  			nodhcp)
- 				unset DHCP
+ 				DHCP=""
+ 				export DHCP
 +				NODHCP="Yes"
 +				export NODHCP
  				;;

diff --git a/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch b/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
@@ -27,8 +27,8 @@
 @DPATCH@
 
 index d79beed..1b6926e 100755
---- a/scripts/live
-+++ b/scripts/live
+--- a/scripts/boot/9990-toram-todisk.sh
++++ b/scripts/boot/9990-toram-todisk.sh
 @@ -202,7 +202,7 @@
 
  	if [ -z "${MODULETORAM}" ]

diff --git a/debian/patches/26_support_dns_bootoption.patch b/debian/patches/26_support_dns_bootoption.patch
@@ -5,9 +5,11 @@
 ## DP: Support dns bootoption. Usage examples: dns=8.8.8.8 / dns=8.8.8.8,1.2.3.4
 
 @DPATCH@
---- a/scripts/live
-+++ b/scripts/live
-@@ -429,7 +429,7 @@
+Index: live-boot-grml/scripts/boot/9990-networking.sh
+===================================================================
+--- live-boot-grml.orig/scripts/boot/9990-networking.sh	2012-11-28 17:23:14.954502427 +0100
++++ live-boot-grml/scripts/boot/9990-networking.sh	2012-11-28 17:46:56.190917365 +0100
+@@ -153,7 +153,7 @@
  				echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
  			fi
 
@@ -16,9 +18,11 @@
  			do
  				if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
  				then
---- a/scripts/live-bottom/23networking_grml
-+++ b/scripts/live-bottom/23networking_grml
-@@ -44,7 +44,12 @@
+Index: live-boot-grml/scripts/boot/9990-grml-networking.sh
+===================================================================
+--- live-boot-grml.orig/scripts/boot/9990-grml-networking.sh	2012-11-28 17:46:38.000000000 +0100
++++ live-boot-grml/scripts/boot/9990-grml-networking.sh	2012-11-28 17:46:56.190917365 +0100
+@@ -28,7 +28,12 @@
 
  # prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)
  IFFILE="/root/etc/network/interfaces"
@@ -32,11 +36,10 @@
 
  # config for loopback networking
  cat > $IFFILE << EOF
-@@ -105,3 +110,17 @@
- 
+@@ -90,4 +95,18 @@
      echo>> $IFFILE
  done
-+
+ 
 +# dns bootoption
 +if [ -n "$DNSSERVER1" ]
 +then
@@ -50,14 +53,16 @@
 +		echo "nameserver $i" >> $RESOLVCONF
 +	done
 +fi
---- a/scripts/live-helpers
-+++ b/scripts/live-helpers
-@@ -59,6 +59,19 @@
++
+ }
+--- live-boot-grml.orig/scripts/boot/9990-cmdline-old	2012-11-28 17:46:38.000000000 +0100
++++ live-boot-grml/scripts/boot/9990-cmdline-old	2012-11-28 17:46:56.190917365 +0100
+@@ -18,6 +18,19 @@
  				BOOTIF="${x#BOOTIF=}"
  				;;
  
 +			dns=*)
-+			  	DNSSERVER="${ARGUMENT#*=}"
++			  	DNSSERVER="${_PARAMETER#*=}"
 +				if echo "${DNSSERVER}" | grep -q , ; then
 +					DNSSERVER1="${DNSSERVER%,*}"
 +					DNSSERVER2="${DNSSERVER#*,}"
@@ -69,6 +74,6 @@
 +				unset DNSSERVER
 +				;;
 +
- 			debug)
- 				DEBUG="Yes"
- 				export DEBUG
+ 			bootid=*)
+ 				BOOTID="${_PARAMETER#bootid=}"
+ 				export BOOTID