Fix patch offsets for quilt patches

diff --git a/debian/patches/05_boot_failure_message_grml.patch b/debian/patches/05_boot_failure_message_grml.patch
old mode 100755 (executable)
new mode 100644 (file)
index 8dd2886..1e31090
--- a/debian/patches/05_boot_failure_message_grml.patch
+++ b/debian/patches/05_boot_failure_message_grml.patch
@@ -6,11 +6,9 @@
 
 @DPATCH@
 
 
 @DPATCH@
 

-diff --git a/scripts/live-functions b/scripts/live-functions
-index 5efe432..faaf23e 100644

 --- a/scripts/live-functions
 +++ b/scripts/live-functions
 --- a/scripts/live-functions
 +++ b/scripts/live-functions

-@@ -88,14 +88,20 @@ panic() {
+@@ -88,14 +88,20 @@

        printf "     ${DEB_1}\n"
        printf "     ${DEB_2}  \033[1;37mBOOT FAILED!\033[0m\n"
        printf "     ${DEB_3}\n"
        printf "     ${DEB_1}\n"
        printf "     ${DEB_2}  \033[1;37mBOOT FAILED!\033[0m\n"
        printf "     ${DEB_3}\n"

diff --git a/debian/patches/07_support_findiso.patch b/debian/patches/07_support_findiso.patch
old mode 100755 (executable)
new mode 100644 (file)
index 540165f..e0b0367
--- a/debian/patches/07_support_findiso.patch
+++ b/debian/patches/07_support_findiso.patch
@@ -10,11 +10,9 @@
 # file is searched inside that ISO file then.
 
 @DPATCH@
 # file is searched inside that ISO file then.
 
 @DPATCH@

-diff --git a/scripts/live b/scripts/live
-index 5681362..12e795b 100755

 --- a/scripts/live
 +++ b/scripts/live
 --- a/scripts/live
 +++ b/scripts/live

-@@ -106,6 +106,11 @@ Arguments ()
+@@ -106,6 +106,11 @@

                                export FETCH
                                ;;
  
                                export FETCH
                                ;;
  


@@ -26,7 +24,7 @@ index 5681362..12e795b 100755
                        forcepersistentfsck)
                                FORCEPERSISTENTFSCK="Yes"
                                export FORCEPERSISTENTFSCK
                        forcepersistentfsck)
                                FORCEPERSISTENTFSCK="Yes"
                                export FORCEPERSISTENTFSCK

-@@ -1629,13 +1634,28 @@ check_dev ()
+@@ -1629,13 +1634,28 @@

                mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
                [ -n "$devuid" ] && echo "$devuid" >> $tried
  
                mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
                [ -n "$devuid" ] && echo "$devuid" >> $tried
  


@@ -56,7 +54,7 @@ index 5681362..12e795b 100755
                fi
        fi
  
                fi
        fi
  

-@@ -1933,6 +1953,22 @@ mountroot ()
+@@ -1933,6 +1953,22 @@

        # when booting FAI, this simple workaround solves it
        ls /root/* >/dev/null 2>&1
  
        # when booting FAI, this simple workaround solves it
        ls /root/* >/dev/null 2>&1
  

diff --git a/debian/patches/08_grml_defaults.patch b/debian/patches/08_grml_defaults.patch
old mode 100755 (executable)
new mode 100644 (file)
index cca4824..89b0f3c
--- a/debian/patches/08_grml_defaults.patch
+++ b/debian/patches/08_grml_defaults.patch
@@ -5,11 +5,9 @@
 ## DP: Pseudo-brand as grml
 
 @DPATCH@
 ## DP: Pseudo-brand as grml
 
 @DPATCH@

-diff --git a/scripts/live b/scripts/live
-index d79beed..04ad61e 100755

 --- a/scripts/live
 +++ b/scripts/live
 --- a/scripts/live
 +++ b/scripts/live

-@@ -16,9 +16,9 @@ home_persistence="home-rw"
+@@ -16,9 +16,9 @@

  root_snapshot_label="live-sn"
  home_snapshot_label="home-sn"
  
  root_snapshot_label="live-sn"
  home_snapshot_label="home-sn"
  


@@ -22,4 +20,3 @@ index d79beed..04ad61e 100755
  
  mkdir -p "${mountpoint}"
  tried="/tmp/tried"
  
  mkdir -p "${mountpoint}"
  tried="/tmp/tried"

-

diff --git a/debian/patches/10_validateroot.patch b/debian/patches/10_validateroot.patch
old mode 100755 (executable)
new mode 100644 (file)
index a813356..042fb19
--- a/debian/patches/10_validateroot.patch
+++ b/debian/patches/10_validateroot.patch
@@ -5,8 +5,6 @@
 ## DP: add live-bottom/10validateroot
 
 @DPATCH@
 ## DP: add live-bottom/10validateroot
 
 @DPATCH@

-diff --git a/scripts/live-bottom/10validateroot b/scripts/live-bottom/10validateroot
-index 0000000..8d42afc

 --- /dev/null
 +++ b/scripts/live-bottom/10validateroot
 @@ -0,0 +1,27 @@
 --- /dev/null
 +++ b/scripts/live-bottom/10validateroot
 @@ -0,0 +1,27 @@

diff --git a/debian/patches/11_dhcphostname.patch b/debian/patches/11_dhcphostname.patch
old mode 100755 (executable)
new mode 100644 (file)
index 162aa56..dbffc7c
--- a/debian/patches/11_dhcphostname.patch
+++ b/debian/patches/11_dhcphostname.patch
@@ -11,11 +11,9 @@ 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.
 

-diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
-index 9554b77..9270e9c 100755

 --- a/scripts/live
 +++ b/scripts/live
 --- a/scripts/live
 +++ b/scripts/live

-@@ -216,6 +216,11 @@ Arguments ()
+@@ -220,6 +220,11 @@

                                export NOACCESSIBILITY
                                ;;
  
                                export NOACCESSIBILITY
                                ;;
  


@@ -27,4 +25,3 @@ index 9554b77..9270e9c 100755
                        nofastboot)
                                NOFASTBOOT="Yes"
                                export NOFASTBOOT
                        nofastboot)
                                NOFASTBOOT="Yes"
                                export NOFASTBOOT

-

diff --git a/debian/patches/12_uuid_support.patch b/debian/patches/12_uuid_support.patch
old mode 100755 (executable)
new mode 100644 (file)
index a8e6ccc..34cee3d
--- a/debian/patches/12_uuid_support.patch
+++ b/debian/patches/12_uuid_support.patch
@@ -12,11 +12,9 @@
 ## DP: * no bootid.txt + ignore_bootid=...                => boots
 
 @DPATCH@
 ## DP: * no bootid.txt + ignore_bootid=...                => boots
 
 @DPATCH@

-diff --git a/scripts/live b/scripts/live
-index abce3cd..851796c 100755

 --- a/scripts/live
 +++ b/scripts/live
 --- a/scripts/live
 +++ b/scripts/live

-@@ -63,6 +63,11 @@ Arguments ()
+@@ -63,6 +63,11 @@

                                export ACCESS
                                ;;
  
                                export ACCESS
                                ;;
  


@@ -28,7 +26,7 @@ index abce3cd..851796c 100755
                        console=*)
                                DEFCONSOLE="${ARGUMENT#*=}"
                                export DEFCONSOLE
                        console=*)
                                DEFCONSOLE="${ARGUMENT#*=}"
                                export DEFCONSOLE

-@@ -140,6 +145,11 @@ Arguments ()
+@@ -144,6 +149,11 @@

                                export FROMISO
                                ;;
  
                                export FROMISO
                                ;;
  


@@ -40,7 +38,7 @@ index abce3cd..851796c 100755
                        ignore_uuid)
                                IGNORE_UUID="Yes"
                                export IGNORE_UUID
                        ignore_uuid)
                                IGNORE_UUID="Yes"
                                export IGNORE_UUID

-@@ -392,6 +402,42 @@ is_live_path ()
+@@ -410,6 +420,42 @@

        return 1
  }
  
        return 1
  }
  


@@ -83,7 +81,7 @@ index abce3cd..851796c 100755
  matches_uuid ()
  {
        if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
  matches_uuid ()
  {
        if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]

-@@ -1550,7 +1596,7 @@ check_dev ()
+@@ -1655,7 +1701,7 @@

                fi
  
                if is_live_path ${mountpoint} && \
                fi
  
                if is_live_path ${mountpoint} && \


@@ -92,7 +90,7 @@ index abce3cd..851796c 100755
                then
                        echo ${mountpoint}
                        return 0
                then
                        echo ${mountpoint}
                        return 0

-@@ -1665,19 +1711,6 @@ find_livefs ()
+@@ -1769,19 +1815,6 @@

                                        return 0
                                fi
                        done
                                        return 0
                                fi
                        done

diff --git a/debian/patches/13_always_display_warnings_and_failures.patch b/debian/patches/13_always_display_warnings_and_failures.patch
old mode 100755 (executable)
new mode 100644 (file)
index 8a204bc..f85217f
--- a/debian/patches/13_always_display_warnings_and_failures.patch
+++ b/debian/patches/13_always_display_warnings_and_failures.patch
@@ -5,8 +5,8 @@
 ## DP: Always display failure and warning messages.
 
 @DPATCH@
 ## DP: Always display failure and warning messages.
 
 @DPATCH@

---- live-initramfs-grml~/scripts/live-functions        2010-02-20 16:03:43.155342432 +0100
-+++ live-initramfs-grml/scripts/live-functions 2010-02-20 16:04:08.675380352 +0100
+--- a/scripts/live-functions
++++ b/scripts/live-functions

 @@ -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
old mode 100755 (executable)
new mode 100644 (file)
index 2b19366..75e1c1b
--- a/debian/patches/14_no_blkid_on_lenny.patch
+++ b/debian/patches/14_no_blkid_on_lenny.patch
@@ -10,7 +10,7 @@
 @DPATCH@
 --- a/scripts/live
 +++ b/scripts/live
 @DPATCH@
 --- a/scripts/live
 +++ b/scripts/live

-@@ -1577,7 +1577,12 @@ check_dev ()
+@@ -1680,7 +1680,12 @@

  
        if is_supported_fs ${fstype}
        then
  
        if is_supported_fs ${fstype}
        then

diff --git a/debian/patches/15_networking_grml.patch b/debian/patches/15_networking_grml.patch
old mode 100755 (executable)
new mode 100644 (file)
index 81b4c0d..bb36204
--- a/debian/patches/15_networking_grml.patch
+++ b/debian/patches/15_networking_grml.patch
@@ -119,4 +119,3 @@ diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_
 +
 +    echo>> $IFFILE
 +done
 +
 +    echo>> $IFFILE
 +done

-+

diff --git a/debian/patches/16_nodhcp.patch b/debian/patches/16_nodhcp.patch
old mode 100755 (executable)
new mode 100644 (file)
index 8f52d21..45a2e33
--- a/debian/patches/16_nodhcp.patch
+++ b/debian/patches/16_nodhcp.patch
@@ -6,14 +6,12 @@
 
 @DPATCH@
 
 
 @DPATCH@
 

-diff --git a/scripts/live b/scripts/live
-index 5681362..46ef54b 100755

 --- a/scripts/live
 +++ b/scripts/live
 --- a/scripts/live
 +++ b/scripts/live

-@@ -88,6 +88,8 @@ Arguments ()
+@@ -93,6 +93,8 @@

  
                        nodhcp)
  
                        nodhcp)

-                               unset DHCP
+                               unset DHCP

 +                              NODHCP="Yes"
 +                              export NODHCP
                                ;;
 +                              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
old mode 100755 (executable)
new mode 100644 (file)
index 9c53cd6..d3717cd
--- 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/live
 +++ b/scripts/live
 index d79beed..1b6926e 100755
 --- a/scripts/live
 +++ b/scripts/live

-@@ -484,7 +484,7 @@ copy_live_to ()
+@@ -563,7 +563,7 @@

  
        if [ -z "${MODULETORAM}" ]
        then
  
        if [ -z "${MODULETORAM}" ]
        then


@@ -38,10 +38,7 @@ index d79beed..1b6926e 100755
        else
                MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
  
        else
                MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
  

-index d79beed..57d1b41 100755
---- a/scripts/live
-+++ b/scripts/live
-@@ -553,8 +553,7 @@ copy_live_to ()
+@@ -639,8 +639,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
                                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/25_support_lvm_for_live-media.patch b/debian/patches/25_support_lvm_for_live-media.patch
old mode 100755 (executable)
new mode 100644 (file)
index b43106a..db4336c
--- a/debian/patches/25_support_lvm_for_live-media.patch
+++ b/debian/patches/25_support_lvm_for_live-media.patch
@@ -8,7 +8,7 @@
 
 --- a/scripts/live
 +++ b/scripts/live
 
 --- a/scripts/live
 +++ b/scripts/live

-@@ -1509,6 +1509,21 @@ check_dev ()
+@@ -1669,6 +1669,21 @@

                        umount $mountpoint
                fi
        fi
                        umount $mountpoint
                fi
        fi

diff --git a/debian/patches/26_support_dns_bootoption.patch b/debian/patches/26_support_dns_bootoption.patch
old mode 100755 (executable)
new mode 100644 (file)
index f79d962..ce1fc47
--- a/debian/patches/26_support_dns_bootoption.patch
+++ b/debian/patches/26_support_dns_bootoption.patch
@@ -5,11 +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@

-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' live-boot-grml~/scripts/live live-boot-grml/scripts/live
---- live-boot-grml~/scripts/live       2011-05-03 17:03:57.483541293 +0200
-+++ live-boot-grml/scripts/live        2011-05-03 17:03:57.576874626 +0200
-@@ -73,6 +73,18 @@
-                               export DEFCONSOLE
+--- a/scripts/live
++++ b/scripts/live
+@@ -77,6 +77,18 @@
+                               BOOTIF="${x#BOOTIF=}"

                                ;;
  
 +                      dns=*)
                                ;;
  
 +                      dns=*)


@@ -27,9 +26,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
                        debug)
                                DEBUG="Yes"
                                export DEBUG
                        debug)
                                DEBUG="Yes"
                                export DEBUG

-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' live-boot-grml~/scripts/live-bottom/23networking_grml live-boot-grml/scripts/live-bottom/23networking_grml
---- live-boot-grml~/scripts/live-bottom/23networking_grml      2011-05-03 17:03:57.426874629 +0200
-+++ live-boot-grml/scripts/live-bottom/23networking_grml       2011-05-03 17:05:11.820206602 +0200
+--- a/scripts/live-bottom/23networking_grml
++++ b/scripts/live-bottom/23networking_grml

 @@ -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
old mode 100755 (executable)
new mode 100644 (file)
index f08e133..03cd679
--- a/debian/patches/27_support_static_ip.patch
+++ b/debian/patches/27_support_static_ip.patch
@@ -6,26 +6,24 @@
 
 @DPATCH@
 
 
 @DPATCH@
 

-diff --git a/scripts/live b/scripts/live
-index 5681362..bf20cce 100755

 --- a/scripts/live
 +++ b/scripts/live
 --- a/scripts/live
 +++ b/scripts/live

-@@ -91,9 +91,8 @@ Arguments ()
-                               ;;
-
-                       ethdevice=*)
+@@ -110,9 +110,8 @@
+                               ;;
+ 
+                       ethdevice=*)

 -                              DEVICE="${ARGUMENT#ethdevice=}"
 -                              ETHDEVICE="${DEVICE}"
 -                              export DEVICE ETHDEVICE
 +                              ETHDEVICE="${ARGUMENT#ethdevice=}"
 +                              export ETHDEVICE
 -                              DEVICE="${ARGUMENT#ethdevice=}"
 -                              ETHDEVICE="${DEVICE}"
 -                              export DEVICE ETHDEVICE
 +                              ETHDEVICE="${ARGUMENT#ethdevice=}"
 +                              export ETHDEVICE

-                               ;;
-
-                       ethdevice-timeout=*)
-@@ -150,13 +149,9 @@ Arguments ()
-                               ;;
-
-                       ip=*)
+                               ;;
+ 
+                       ethdevice-timeout=*)
+@@ -179,13 +178,9 @@
+                               ;;
+ 
+                       ip=*)

 -                              STATICIP="${ARGUMENT#ip=}"
 -
 -                              if [ -z "${STATICIP}" ]
 -                              STATICIP="${ARGUMENT#ip=}"
 -
 -                              if [ -z "${STATICIP}" ]


@@ -36,13 +34,13 @@ index 5681362..bf20cce 100755
 +                              # copy complete ip=args into staticip, and
 +                              # keep multiple uses.
 +                              STATICIP="${STATICIP} ${ARGUMENT}"
 +                              # copy complete ip=args into staticip, and
 +                              # keep multiple uses.
 +                              STATICIP="${STATICIP} ${ARGUMENT}"

-                               export STATICIP
-                               ;;
-
-@@ -598,6 +593,24 @@ copy_live_to ()
-       return 0
+                               export STATICIP
+                               ;;
+ 
+@@ -667,6 +662,24 @@
+       return 0

  }
  }

-
+ 

 +get_ipconfig_para()
 +{
 +      if [ $# != 1 ] ; then
 +get_ipconfig_para()
 +{
 +      if [ $# != 1 ] ; then


@@ -63,11 +61,11 @@ index 5681362..bf20cce 100755
 +
  do_netsetup ()
  {
 +
  do_netsetup ()
  {

-       modprobe -q af_packet # For DHCP
-@@ -608,9 +621,19 @@ do_netsetup ()
-       [ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
-       echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
-
+       modprobe -q af_packet # For DHCP
+@@ -677,9 +690,19 @@
+       [ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
+       echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
+ 

 -      if [ -z "${NETBOOT}" ] && [ -z "${FETCH}" ] && \
 -         [ -z "${HTTPFS}" ] && [ -z "${FTPFS}" ]
 -      then
 -      if [ -z "${NETBOOT}" ] && [ -z "${FETCH}" ] && \
 -         [ -z "${HTTPFS}" ] && [ -z "${FTPFS}" ]
 -      then


@@ -84,22 +82,22 @@ index 5681362..bf20cce 100755
 +      for device in ${ALLDEVICES}; do
 +              ipconfig -c none -d $device -t 1 2>/dev/null >/dev/null
 +      done
 +      for device in ${ALLDEVICES}; do
 +              ipconfig -c none -d $device -t 1 2>/dev/null >/dev/null
 +      done

-
-
-       # support for Syslinux IPAPPEND parameter
-@@ -653,7 +676,7 @@ do_netsetup ()
-
-                               if [ "$bootif_mac" = "$current_mac" ]
-                               then
+ 
+ 
+       # support for Syslinux IPAPPEND parameter
+@@ -722,7 +745,7 @@
+ 
+                               if [ "$bootif_mac" = "$current_mac" ]
+                               then

 -                                      DEVICE=${device##*/}
 +                                      ETHDEVICE="${device##*/},$ETHDEVICE" # use ethdevice
 -                                      DEVICE=${device##*/}
 +                                      ETHDEVICE="${device##*/},$ETHDEVICE" # use ethdevice

-                                       break
-                               fi
-                       fi
-@@ -665,12 +688,7 @@ do_netsetup ()
-       # for *every* present network device (except for loopback of course)
-       if [ -z "$ETHDEVICE" ] ; then
-               echo "If you want to boot from a specific device use bootoption ethdevice=..."
+                                       break
+                               fi
+                       fi
+@@ -734,12 +757,7 @@
+       # for *every* present network device (except for loopback of course)
+       if [ -z "$ETHDEVICE" ] ; then
+               echo "If you want to boot from a specific device use bootoption ethdevice=..."

 -              for device in /sys/class/net/*; do
 -                      dev=${device##*/} ;
 -                      if [ "$dev" != "lo" ] ; then
 -              for device in /sys/class/net/*; do
 -                      dev=${device##*/} ;
 -                      if [ "$dev" != "lo" ] ; then


@@ -107,13 +105,13 @@ index 5681362..bf20cce 100755
 -                      fi
 -              done
 +        ETHDEVICE="$ALLDEVICES"
 -                      fi
 -              done
 +        ETHDEVICE="$ALLDEVICES"

-       fi
-
-       # split args of ethdevice=eth0,eth1 into "eth0 eth1"
-@@ -678,38 +696,27 @@ do_netsetup ()
-               devlist="$devlist $device"
-       done
-
+       fi
+ 
+       # split args of ethdevice=eth0,eth1 into "eth0 eth1"
+@@ -747,38 +765,27 @@
+               devlist="$devlist $device"
+       done
+ 

 -      # this is tricky (and ugly) because ipconfig sometimes just hangs/runs into
 -      # an endless loop; iff execution fails give it two further tries, that's
 -      # why we use '$devlist $devlist $devlist' for the other for loop
 -      # this is tricky (and ugly) because ipconfig sometimes just hangs/runs into
 -      # an endless loop; iff execution fails give it two further tries, that's
 -      # why we use '$devlist $devlist $devlist' for the other for loop


@@ -130,13 +128,13 @@ index 5681362..bf20cce 100755
 +              if [ -n "$NODHCP" ] && [ "$param" = "$dev" ] ; then
 +                      echo "Ignoring network device $dev due to nodhcp." | tee -a /live-boot.log
 +                      continue
 +              if [ -n "$NODHCP" ] && [ "$param" = "$dev" ] ; then
 +                      echo "Ignoring network device $dev due to nodhcp." | tee -a /live-boot.log
 +                      continue

-               fi
+               fi

 +              echo "Executing ipconfig -t $ETHDEV_TIMEOUT $param"
 +              ipconfig -t "$ETHDEV_TIMEOUT" "$param" | tee -a /netboot.config
 +              echo "Executing ipconfig -t $ETHDEV_TIMEOUT $param"
 +              ipconfig -t "$ETHDEV_TIMEOUT" "$param" | tee -a /netboot.config

-
-               # if configuration of device worked we should have an assigned
-               # IP address, iff so let's use the according as $DEVICE for later usage
-               # simple and primitive approach which seems to work fine
+ 
+               # if configuration of device worked we should have an assigned
+               # IP address, iff so let's use the according as $DEVICE for later usage
+               # simple and primitive approach which seems to work fine

 -              if ifconfig $dev | grep -q 'inet.*addr:' ; then
 -                      export DEVICE="$dev"
 -                      break
 -              if ifconfig $dev | grep -q 'inet.*addr:' ; then
 -                      export DEVICE="$dev"
 -                      break


@@ -145,9 +143,9 @@ index 5681362..bf20cce 100755
 +              if [ "${IPV4ADDR}" != "0.0.0.0" ]; then
 +                      export DEVICE="$dev $DEVICE"
 +                      # break  # exit loop as we just use the irst
 +              if [ "${IPV4ADDR}" != "0.0.0.0" ]; then
 +                      export DEVICE="$dev $DEVICE"
 +                      # break  # exit loop as we just use the irst

-               fi
+               fi

 -      done
 -      done

-
+ 

 -      else
 -              for interface in ${DEVICE}; do
 -                      ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config
 -      else
 -              for interface in ${DEVICE}; do
 -                      ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config


@@ -160,6 +158,6 @@ index 5681362..bf20cce 100755
 -      fi
 +      done
 +      unset devlist
 -      fi
 +      done
 +      unset devlist

-
-       for interface in ${DEVICE}; do
-               # source relevant ipconfig output
+ 
+       for interface in ${DEVICE}; do
+               # source relevant ipconfig output

diff --git a/debian/patches/28_remove_localized_manpages.patch b/debian/patches/28_remove_localized_manpages.patch
index 5143027..327667c 100644 (file)
--- a/debian/patches/28_remove_localized_manpages.patch
+++ b/debian/patches/28_remove_localized_manpages.patch
@@ -11,11 +11,9 @@ 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.
 

-diff --git a/Makefile b/Makefile
-index 4e579a3..46de269 100644

 --- a/Makefile
 +++ b/Makefile
 --- a/Makefile
 +++ b/Makefile

-@@ -66,15 +66,6 @@ install:
+@@ -66,15 +66,6 @@

                install -D -m 0644 $${MANPAGE} $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${MANPAGE}); \
        done
  
                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 5f073e5..856913d 100644 (file)
--- a/debian/patches/29_support_dns_in_initramfs.patch
+++ b/debian/patches/29_support_dns_in_initramfs.patch
@@ -6,11 +6,9 @@ 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]
 

-diff --git a/hooks/live b/hooks/live
-index 309c26f..3862a60 100755

 --- a/hooks/live
 +++ b/hooks/live
 --- a/hooks/live
 +++ b/hooks/live

-@@ -252,17 +252,14 @@ then
+@@ -258,17 +258,14 @@

        manual_add_modules crc32c
  fi
  
        manual_add_modules crc32c
  fi
  


@@ -20,16 +18,15 @@ index 309c26f..3862a60 100755
 -      #copy_exec /lib/libnss_files.so.*      /lib  # /etc/hosts and /etc/passwd
 -      copy_exec /lib/libnss_dns.so.*      /lib  # DNS server
 -      #copy_exec /lib/libnss_compat.so.*      /lib  # /etc/passwd
 -      #copy_exec /lib/libnss_files.so.*      /lib  # /etc/hosts and /etc/passwd
 -      copy_exec /lib/libnss_dns.so.*      /lib  # DNS server
 -      #copy_exec /lib/libnss_compat.so.*      /lib  # /etc/passwd

--
--      # Configuration file - may be needed if /etc/hosts is used.
--      #mkdir -p $DESTDIR/etc
--      #cp -p /etc/nsswitch.conf $DESTDIR/etc
--fi

 +# DNS for initramfs
 +#copy_exec /lib/libnss_files.so.*      /lib  # /etc/hosts and /etc/passwd
 +copy_exec /lib/libnss_dns.so.*      /lib  # DNS server
 +#copy_exec /lib/libnss_compat.so.*      /lib  # /etc/passwd
 +# DNS for initramfs
 +#copy_exec /lib/libnss_files.so.*      /lib  # /etc/hosts and /etc/passwd
 +copy_exec /lib/libnss_dns.so.*      /lib  # DNS server
 +#copy_exec /lib/libnss_compat.so.*      /lib  # /etc/passwd

-+
+ 
+-      # Configuration file - may be needed if /etc/hosts is used.
+-      #mkdir -p $DESTDIR/etc
+-      #cp -p /etc/nsswitch.conf $DESTDIR/etc
+-fi

 +# Configuration file - may be needed if /etc/hosts is used.
 +#mkdir -p $DESTDIR/etc
 +#cp -p /etc/nsswitch.conf $DESTDIR/etc
 +# Configuration file - may be needed if /etc/hosts is used.
 +#mkdir -p $DESTDIR/etc
 +#cp -p /etc/nsswitch.conf $DESTDIR/etc

diff --git a/debian/patches/30_support_multiarch_dns.patch b/debian/patches/30_support_multiarch_dns.patch
index c4cc8d8..90d1b66 100644 (file)
--- a/debian/patches/30_support_multiarch_dns.patch
+++ b/debian/patches/30_support_multiarch_dns.patch
@@ -12,11 +12,9 @@ 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.*.
 

-diff --git a/hooks/live b/hooks/live
-index 3862a60..b3de1e5 100755

 --- a/hooks/live
 +++ b/hooks/live
 --- a/hooks/live
 +++ b/hooks/live

-@@ -254,7 +254,16 @@ fi
+@@ -260,7 +260,16 @@

  
  # DNS for initramfs
  #copy_exec /lib/libnss_files.so.*      /lib  # /etc/hosts and /etc/passwd
  
  # DNS for initramfs
  #copy_exec /lib/libnss_files.so.*      /lib  # /etc/hosts and /etc/passwd