Refresh quilt patches

diff --git a/debian/patches/01_fix_output_file.patch b/debian/patches/01_fix_output_file.patch
index 4dce5d4..455122c 100644 (file)
--- a/debian/patches/01_fix_output_file.patch
+++ b/debian/patches/01_fix_output_file.patch
@@ -1,5 +1,7 @@
---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:07:22.000000000 +0200
++++ b/scripts/live     2011-07-24 22:07:54.000000000 +0200

 @@ -1590,7 +1590,7 @@
                                loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
                                devname="${loopdevname}"
 @@ -1590,7 +1590,7 @@
                                loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
                                devname="${loopdevname}"

diff --git a/debian/patches/03_grml_version_file_hook.patch b/debian/patches/03_grml_version_file_hook.patch
index df27676..fd7a7e5 100644 (file)
--- a/debian/patches/03_grml_version_file_hook.patch
+++ b/debian/patches/03_grml_version_file_hook.patch
@@ -6,8 +6,10 @@
 
 @DPATCH@
 
 
 @DPATCH@
 

---- a/hooks/live
-+++ b/hooks/live
+Index: b/hooks/live
+===================================================================
+--- a/hooks/live       2011-07-24 22:07:22.000000000 +0200
++++ b/hooks/live       2011-07-24 22:07:55.000000000 +0200

 @@ -40,6 +40,12 @@
        done
  fi
 @@ -40,6 +40,12 @@
        done
  fi

diff --git a/debian/patches/05_boot_failure_message_grml.patch b/debian/patches/05_boot_failure_message_grml.patch
index 1e31090..ebcf436 100644 (file)
--- a/debian/patches/05_boot_failure_message_grml.patch
+++ b/debian/patches/05_boot_failure_message_grml.patch
@@ -6,8 +6,10 @@
 
 @DPATCH@
 
 
 @DPATCH@
 

---- a/scripts/live-functions
-+++ b/scripts/live-functions
+Index: b/scripts/live-functions
+===================================================================
+--- a/scripts/live-functions   2011-07-24 22:07:22.000000000 +0200
++++ b/scripts/live-functions   2011-07-24 22:07:56.000000000 +0200

 @@ -88,14 +88,20 @@
        printf "     ${DEB_1}\n"
        printf "     ${DEB_2}  \033[1;37mBOOT FAILED!\033[0m\n"
 @@ -88,14 +88,20 @@
        printf "     ${DEB_1}\n"
        printf "     ${DEB_2}  \033[1;37mBOOT FAILED!\033[0m\n"

diff --git a/debian/patches/07_support_findiso.patch b/debian/patches/07_support_findiso.patch
index e0b0367..de1d9be 100644 (file)
--- a/debian/patches/07_support_findiso.patch
+++ b/debian/patches/07_support_findiso.patch
@@ -10,8 +10,10 @@
 # file is searched inside that ISO file then.
 
 @DPATCH@
 # file is searched inside that ISO file then.
 
 @DPATCH@

---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:07:54.000000000 +0200
++++ b/scripts/live     2011-07-24 22:07:58.000000000 +0200

 @@ -106,6 +106,11 @@
                                export FETCH
                                ;;
 @@ -106,6 +106,11 @@
                                export FETCH
                                ;;

diff --git a/debian/patches/08_grml_defaults.patch b/debian/patches/08_grml_defaults.patch
index 89b0f3c..b7e7a87 100644 (file)
--- a/debian/patches/08_grml_defaults.patch
+++ b/debian/patches/08_grml_defaults.patch
@@ -5,8 +5,10 @@
 ## DP: Pseudo-brand as grml
 
 @DPATCH@
 ## DP: Pseudo-brand as grml
 
 @DPATCH@

---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:07:58.000000000 +0200
++++ b/scripts/live     2011-07-24 22:07:59.000000000 +0200

 @@ -16,9 +16,9 @@
  root_snapshot_label="live-sn"
  home_snapshot_label="home-sn"
 @@ -16,9 +16,9 @@
  root_snapshot_label="live-sn"
  home_snapshot_label="home-sn"

diff --git a/debian/patches/10_validateroot.patch b/debian/patches/10_validateroot.patch
index 042fb19..59da1da 100644 (file)
--- a/debian/patches/10_validateroot.patch
+++ b/debian/patches/10_validateroot.patch
@@ -5,8 +5,10 @@
 ## DP: add live-bottom/10validateroot
 
 @DPATCH@
 ## DP: add live-bottom/10validateroot
 
 @DPATCH@

---- /dev/null
-+++ b/scripts/live-bottom/10validateroot
+Index: b/scripts/live-bottom/10validateroot
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ b/scripts/live-bottom/10validateroot       2011-07-24 22:08:00.000000000 +0200

 @@ -0,0 +1,27 @@
 +#!/bin/sh
 +
 @@ -0,0 +1,27 @@
 +#!/bin/sh
 +

diff --git a/debian/patches/11_dhcphostname.patch b/debian/patches/11_dhcphostname.patch
index dbffc7c..c00a8b8 100644 (file)
--- a/debian/patches/11_dhcphostname.patch
+++ b/debian/patches/11_dhcphostname.patch
@@ -11,8 +11,10 @@ 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.
 
 hostname of the booted system according to the DNS information.
 This patch takes care of the netboot case.
 

---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:07:59.000000000 +0200
++++ b/scripts/live     2011-07-24 22:08:02.000000000 +0200

 @@ -220,6 +220,11 @@
                                export NOACCESSIBILITY
                                ;;
 @@ -220,6 +220,11 @@
                                export NOACCESSIBILITY
                                ;;

diff --git a/debian/patches/12_uuid_support.patch b/debian/patches/12_uuid_support.patch
index 34cee3d..0a60612 100644 (file)
--- a/debian/patches/12_uuid_support.patch
+++ b/debian/patches/12_uuid_support.patch
@@ -12,8 +12,10 @@
 ## DP: * no bootid.txt + ignore_bootid=...                => boots
 
 @DPATCH@
 ## DP: * no bootid.txt + ignore_bootid=...                => boots
 
 @DPATCH@

---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:08:02.000000000 +0200
++++ b/scripts/live     2011-07-24 22:08:03.000000000 +0200

 @@ -63,6 +63,11 @@
                                export ACCESS
                                ;;
 @@ -63,6 +63,11 @@
                                export ACCESS
                                ;;

diff --git a/debian/patches/13_always_display_warnings_and_failures.patch b/debian/patches/13_always_display_warnings_and_failures.patch
index f85217f..31277f5 100644 (file)
--- a/debian/patches/13_always_display_warnings_and_failures.patch
+++ b/debian/patches/13_always_display_warnings_and_failures.patch
@@ -5,8 +5,10 @@
 ## DP: Always display failure and warning messages.
 
 @DPATCH@
 ## DP: Always display failure and warning messages.
 
 @DPATCH@

---- a/scripts/live-functions
-+++ b/scripts/live-functions
+Index: b/scripts/live-functions
+===================================================================
+--- a/scripts/live-functions   2011-07-24 22:07:56.000000000 +0200
++++ b/scripts/live-functions   2011-07-24 22:08:04.000000000 +0200

 @@ -2,6 +2,17 @@
  . /scripts/functions
  . /live.vars
 @@ -2,6 +2,17 @@
  . /scripts/functions
  . /live.vars

diff --git a/debian/patches/14_no_blkid_on_lenny.patch b/debian/patches/14_no_blkid_on_lenny.patch
index 75e1c1b..22bc752 100644 (file)
--- a/debian/patches/14_no_blkid_on_lenny.patch
+++ b/debian/patches/14_no_blkid_on_lenny.patch
@@ -8,8 +8,10 @@
 ## DP: /lib/udev/vol_id in /scripts/live as well
 
 @DPATCH@
 ## DP: /lib/udev/vol_id in /scripts/live as well
 
 @DPATCH@

---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:08:03.000000000 +0200
++++ b/scripts/live     2011-07-24 22:08:06.000000000 +0200

 @@ -1680,7 +1680,12 @@
  
        if is_supported_fs ${fstype}
 @@ -1680,7 +1680,12 @@
  
        if is_supported_fs ${fstype}

diff --git a/debian/patches/15_networking_grml.patch b/debian/patches/15_networking_grml.patch
index bb36204..fd257e1 100644 (file)
--- a/debian/patches/15_networking_grml.patch
+++ b/debian/patches/15_networking_grml.patch
@@ -9,8 +9,10 @@
 @DPATCH@
 
 diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_grml
 @DPATCH@
 
 diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_grml

---- /dev/null
-+++ b/scripts/live-bottom/23networking_grml
+Index: b/scripts/live-bottom/23networking_grml
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ b/scripts/live-bottom/23networking_grml    2011-07-24 22:08:07.000000000 +0200

 @@ -0,0 +1,107 @@
 +#!/bin/sh
 +
 @@ -0,0 +1,107 @@
 +#!/bin/sh
 +

diff --git a/debian/patches/16_nodhcp.patch b/debian/patches/16_nodhcp.patch
index 45a2e33..2be5a9b 100644 (file)
--- a/debian/patches/16_nodhcp.patch
+++ b/debian/patches/16_nodhcp.patch
@@ -6,8 +6,10 @@
 
 @DPATCH@
 
 
 @DPATCH@
 

---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:08:06.000000000 +0200
++++ b/scripts/live     2011-07-24 22:08:09.000000000 +0200

 @@ -93,6 +93,8 @@
  
                        nodhcp)
 @@ -93,6 +93,8 @@
  
                        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
index d3717cd..627f709 100644 (file)
--- 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,10 @@
 @DPATCH@
 
 index d79beed..1b6926e 100755
 @DPATCH@
 
 index d79beed..1b6926e 100755

---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:08:09.000000000 +0200
++++ b/scripts/live     2011-07-24 22:08:10.000000000 +0200

 @@ -563,7 +563,7 @@
  
        if [ -z "${MODULETORAM}" ]
 @@ -563,7 +563,7 @@
  
        if [ -z "${MODULETORAM}" ]

diff --git a/debian/patches/25_support_lvm_for_live-media.patch b/debian/patches/25_support_lvm_for_live-media.patch
index d699738..63b6f03 100644 (file)
--- a/debian/patches/25_support_lvm_for_live-media.patch
+++ b/debian/patches/25_support_lvm_for_live-media.patch
@@ -6,8 +6,10 @@
 
 @DPATCH@
 
 
 @DPATCH@
 

---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:08:10.000000000 +0200
++++ b/scripts/live     2011-07-24 22:08:11.000000000 +0200

 @@ -1669,6 +1669,29 @@
                        umount $mountpoint
                fi
 @@ -1669,6 +1669,29 @@
                        umount $mountpoint
                fi

diff --git a/debian/patches/26_support_dns_bootoption.patch b/debian/patches/26_support_dns_bootoption.patch
index ce1fc47..3df83d7 100644 (file)
--- a/debian/patches/26_support_dns_bootoption.patch
+++ b/debian/patches/26_support_dns_bootoption.patch
@@ -5,8 +5,10 @@
 ## DP: Support dns bootoption. Usage examples: dns=8.8.8.8 / dns=8.8.8.8,1.2.3.4
 
 @DPATCH@
 ## 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
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:08:11.000000000 +0200
++++ b/scripts/live     2011-07-24 22:08:13.000000000 +0200

 @@ -77,6 +77,18 @@
                                BOOTIF="${x#BOOTIF=}"
                                ;;
 @@ -77,6 +77,18 @@
                                BOOTIF="${x#BOOTIF=}"
                                ;;


@@ -26,8 +28,10 @@
                        debug)
                                DEBUG="Yes"
                                export DEBUG
                        debug)
                                DEBUG="Yes"
                                export DEBUG

---- a/scripts/live-bottom/23networking_grml
-+++ b/scripts/live-bottom/23networking_grml
+Index: b/scripts/live-bottom/23networking_grml
+===================================================================
+--- a/scripts/live-bottom/23networking_grml    2011-07-24 22:08:07.000000000 +0200
++++ b/scripts/live-bottom/23networking_grml    2011-07-24 22:08:13.000000000 +0200

 @@ -44,7 +44,12 @@
  
  # prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)
 @@ -44,7 +44,12 @@
  
  # prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)

diff --git a/debian/patches/27_support_static_ip.patch b/debian/patches/27_support_static_ip.patch
index 03cd679..fb99ba6 100644 (file)
--- a/debian/patches/27_support_static_ip.patch
+++ b/debian/patches/27_support_static_ip.patch
@@ -6,8 +6,10 @@
 
 @DPATCH@
 
 
 @DPATCH@
 

---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:08:13.000000000 +0200
++++ b/scripts/live     2011-07-24 22:08:14.000000000 +0200

 @@ -110,9 +110,8 @@
                                ;;
  
 @@ -110,9 +110,8 @@
                                ;;
  

diff --git a/debian/patches/28_remove_localized_manpages.patch b/debian/patches/28_remove_localized_manpages.patch
index 327667c..e261f1b 100644 (file)
--- a/debian/patches/28_remove_localized_manpages.patch
+++ b/debian/patches/28_remove_localized_manpages.patch
@@ -11,8 +11,10 @@ Date:   Wed Jun 8 10:19:29 2011 +0200
     
     So lets drop the localized manpages and just install the english ones.
 
     
     So lets drop the localized manpages and just install the english ones.
 

---- a/Makefile
-+++ b/Makefile
+Index: b/Makefile
+===================================================================
+--- a/Makefile 2011-07-24 22:07:22.000000000 +0200
++++ b/Makefile 2011-07-24 22:08:15.000000000 +0200

 @@ -66,15 +66,6 @@
                install -D -m 0644 $${MANPAGE} $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${MANPAGE}); \
        done
 @@ -66,15 +66,6 @@
                install -D -m 0644 $${MANPAGE} $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${MANPAGE}); \
        done

diff --git a/debian/patches/29_support_dns_in_initramfs.patch b/debian/patches/29_support_dns_in_initramfs.patch
index 856913d..33248d7 100644 (file)
--- a/debian/patches/29_support_dns_in_initramfs.patch
+++ b/debian/patches/29_support_dns_in_initramfs.patch
@@ -6,8 +6,10 @@ Date:   Fri Mar 25 23:02:38 2011 +0100
     
     Thanks to Ulrich Dangel for discovering this. [Closes: issue848]
 
     
     Thanks to Ulrich Dangel for discovering this. [Closes: issue848]
 

---- a/hooks/live
-+++ b/hooks/live
+Index: b/hooks/live
+===================================================================
+--- a/hooks/live       2011-07-24 22:07:55.000000000 +0200
++++ b/hooks/live       2011-07-24 22:08:17.000000000 +0200

 @@ -258,17 +258,14 @@
        manual_add_modules crc32c
  fi
 @@ -258,17 +258,14 @@
        manual_add_modules crc32c
  fi

diff --git a/debian/patches/30_support_multiarch_dns.patch b/debian/patches/30_support_multiarch_dns.patch
index 90d1b66..90bd12b 100644 (file)
--- a/debian/patches/30_support_multiarch_dns.patch
+++ b/debian/patches/30_support_multiarch_dns.patch
@@ -12,8 +12,10 @@ Date:   Tue Jun 7 10:15:52 2011 +0200
     /lib/libnss_dns.so.* but could also be e.g.
     /lib/x86_64-linux-gnu/libnss_dns.so.*.
 
     /lib/libnss_dns.so.* but could also be e.g.
     /lib/x86_64-linux-gnu/libnss_dns.so.*.
 

---- a/hooks/live
-+++ b/hooks/live
+Index: b/hooks/live
+===================================================================
+--- a/hooks/live       2011-07-24 22:08:17.000000000 +0200
++++ b/hooks/live       2011-07-24 22:08:18.000000000 +0200

 @@ -260,7 +260,16 @@
  
  # DNS for initramfs
 @@ -260,7 +260,16 @@
  
  # DNS for initramfs