Refresh patches against current master

diff --git a/debian/patches/12_uuid_support.patch b/debian/patches/12_uuid_support.patch
index 67f05c4..ed51916 100644 (file)
--- a/debian/patches/12_uuid_support.patch
+++ b/debian/patches/12_uuid_support.patch
@@ -14,7 +14,7 @@
 @DPATCH@
 --- a/scripts/boot/9990-misc-helpers.sh
 +++ b/scripts/boot/9990-misc-helpers.sh
-@@ -52,6 +52,42 @@
+@@ -20,6 +20,42 @@
        return 1
  }
  
@@ -57,7 +57,7 @@
  matches_uuid ()
  {
        if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1350,7 +1386,7 @@
+@@ -247,7 +283,7 @@
                fi
  
                if is_live_path ${mountpoint} && \
@@ -66,7 +66,7 @@
                then
                        echo ${mountpoint}
                        return 0
-@@ -1446,19 +1482,6 @@
+@@ -343,19 +379,6 @@
                                        return 0
                                fi
                        done

diff --git a/debian/patches/16_nodhcp.patch b/debian/patches/16_nodhcp.patch
index d4986dc..1fe1282 100644 (file)
--- a/debian/patches/16_nodhcp.patch
+++ b/debian/patches/16_nodhcp.patch
@@ -8,7 +8,7 @@
 
 --- a/scripts/boot/9990-cmdline-old
 +++ b/scripts/boot/9990-cmdline-old
-@@ -28,6 +28,8 @@
+@@ -33,6 +33,8 @@
                        nodhcp)
                                DHCP=""
                                export DHCP

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 892a37e..b2fe5ef 100644 (file)
--- a/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
+++ b/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
@@ -29,7 +29,7 @@
 index d79beed..1b6926e 100755
 --- a/scripts/boot/9990-toram-todisk.sh
 +++ b/scripts/boot/9990-toram-todisk.sh
-@@ -202,7 +202,7 @@
+@@ -10,7 +10,7 @@
  
        if [ -z "${MODULETORAM}" ]
        then
@@ -38,7 +38,7 @@ index d79beed..1b6926e 100755
        else
                MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
  
-@@ -278,8 +278,7 @@
+@@ -86,8 +86,7 @@
                                echo " * Copying whole medium to RAM" 1>/dev/console
                                rsync -a --progress ${copyfrom}/* ${copyto} 1>/dev/console  # "cp -a" from busybox also copies hidden files
                        else

diff --git a/debian/patches/29_support_dns_in_initramfs.patch b/debian/patches/29_support_dns_in_initramfs.patch
index 6581160..b4b3cb5 100644 (file)
--- a/debian/patches/29_support_dns_in_initramfs.patch
+++ b/debian/patches/29_support_dns_in_initramfs.patch
@@ -8,7 +8,7 @@ Date:   Fri Mar 25 23:02:38 2011 +0100
 
 --- a/backends/initramfs-tools/live.hook
 +++ b/backends/initramfs-tools/live.hook
-@@ -217,24 +217,20 @@ fi
+@@ -223,24 +223,20 @@
  
  # Some experimental stuff
  
@@ -20,24 +20,26 @@ Date:   Fri Mar 25 23:02:38 2011 +0100
 -              # /lib/libnss_dns.so.*:a   DNS
 -              # /lib/libnss_files.so.*:  /etc/hosts and /etc/passwd
 -              # /lib/libnss_compat.so.*: /etc/passwd
-+# /lib/libnss_dns.so.*:a   DNS
-+# /lib/libnss_files.so.*:  /etc/hosts and /etc/passwd
-+# /lib/libnss_compat.so.*: /etc/passwd
- 
+-
 -              for _SHLIB in $(find /lib -name 'libnss_dns.so.*')
 -              do
 -                      copy_exec "${_SHLIB}"
 -              done
-+for _SHLIB in $(find /lib -name 'libnss_dns.so.*')
-+do
-+      copy_exec "${_SHLIB}"
-+done
- 
+-
 -              # might be needed if /etc/hosts is used
 -              #mkdir -p "${DESTDIR}/etc"
 -              #cp -p /etc/nsswitch.conf "${DESTDIR}/etc"
 -              ;;
 -esac
++# /lib/libnss_dns.so.*:a   DNS
++# /lib/libnss_files.so.*:  /etc/hosts and /etc/passwd
++# /lib/libnss_compat.so.*: /etc/passwd
++
++for _SHLIB in $(find /lib -name 'libnss_dns.so.*')
++do
++      copy_exec "${_SHLIB}"
++done
++
 +# might be needed if /etc/hosts is used
 +#mkdir -p "${DESTDIR}/etc"
 +#cp -p /etc/nsswitch.conf "${DESTDIR}/etc"

diff --git a/debian/patches/33_retry_phram.patch b/debian/patches/33_retry_phram.patch
index ea60cca..b124cbd 100644 (file)
--- a/debian/patches/33_retry_phram.patch
+++ b/debian/patches/33_retry_phram.patch
@@ -9,7 +9,7 @@ Date:   Mon Jul 11 12:42:24 2011 +0200
 
 --- a/scripts/boot/9990-main.sh
 +++ b/scripts/boot/9990-main.sh
-@@ -1576,6 +1576,7 @@
+@@ -60,6 +60,7 @@
                                then
                                        # We found a memdisk, set up phram
                                        modprobe phram phram=memdisk,${MEMDISK}

diff --git a/debian/patches/34_ignore_unknown_filesystems.patch b/debian/patches/34_ignore_unknown_filesystems.patch
index 5212abb..786f70a 100644 (file)
--- a/debian/patches/34_ignore_unknown_filesystems.patch
+++ b/debian/patches/34_ignore_unknown_filesystems.patch
@@ -1,6 +1,6 @@
 --- a/scripts/boot/9990-misc-helpers.sh
 +++ b/scripts/boot/9990-misc-helpers.sh
-@@ -507,6 +507,12 @@
+@@ -491,6 +491,12 @@
                return 1
        fi
  

diff --git a/debian/patches/36_support_dhcp_bootoption.patch b/debian/patches/36_support_dhcp_bootoption.patch
index 6691a9b..9c81a2e 100644 (file)
--- a/debian/patches/36_support_dhcp_bootoption.patch
+++ b/debian/patches/36_support_dhcp_bootoption.patch
@@ -1,6 +1,6 @@
 --- a/scripts/boot/9990-grml-networking.sh
 +++ b/scripts/boot/9990-grml-networking.sh
-@@ -75,6 +75,14 @@
+@@ -59,6 +59,14 @@
          method="manual"
      fi
  

diff --git a/debian/patches/40_support_multiple_hooks.patch b/debian/patches/40_support_multiple_hooks.patch
index 36f72f2..ffdd399 100644 (file)
--- a/debian/patches/40_support_multiple_hooks.patch
+++ b/debian/patches/40_support_multiple_hooks.patch
@@ -1,7 +1,5 @@
-Index: live-boot-grml/Makefile
-===================================================================
---- live-boot-grml.orig/Makefile       2012-11-28 16:30:56.243755796 +0100
-+++ live-boot-grml/Makefile    2012-11-28 16:36:50.614711051 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -47,9 +47,13 @@
  
        # Installing executables