update our patches on top of Debian's 4.0~alpha19

Droped patches:
 - 43_fix_udev_usage_in_is_nice_device.patch
 - 44_fix_mdadm_usage_for_findiso.patch

diff --git a/debian/patches/03_grml_version_file_hook.patch b/debian/patches/03_grml_version_file_hook.patch
index 3ddcb07..7aa4f24 100644 (file)
--- a/debian/patches/03_grml_version_file_hook.patch
+++ b/debian/patches/03_grml_version_file_hook.patch
@@ -6,9 +6,11 @@
 
 @DPATCH@
 
 
 @DPATCH@
 

---- a/backends/initramfs-tools/live.hook
-+++ b/backends/initramfs-tools/live.hook
-@@ -16,6 +16,12 @@ do
+Index: live-boot-grml/backend/initramfs-tools/live.hook
+===================================================================
+--- live-boot-grml.orig/backend/initramfs-tools/live.hook      2014-03-08 13:18:27.443095163 +0100
++++ live-boot-grml/backend/initramfs-tools/live.hook   2014-03-08 13:18:27.439095633 +0100
+@@ -16,6 +16,12 @@

        fi
  done
  
        fi
  done
  


@@ -19,5 +21,5 @@
 +fi
 +
  # Checking live-boot
 +fi
 +
  # Checking live-boot

- if [ ! -e /lib/live/boot ]
+ if [ ! -e /bin/live-boot ]

  then
  then

diff --git a/debian/patches/05_boot_failure_message_grml.patch b/debian/patches/05_boot_failure_message_grml.patch
index d01b1cc..794555a 100644 (file)
--- a/debian/patches/05_boot_failure_message_grml.patch
+++ b/debian/patches/05_boot_failure_message_grml.patch
@@ -6,9 +6,11 @@
 
 @DPATCH@
 
 
 @DPATCH@
 

---- a/scripts/boot/9990-initramfs-tools.sh
-+++ b/scripts/boot/9990-initramfs-tools.sh
-@@ -43,14 +43,20 @@ panic() {
+Index: live-boot-grml/components/9990-initramfs-tools.sh
+===================================================================
+--- live-boot-grml.orig/components/9990-initramfs-tools.sh     2014-03-08 13:20:10.746978063 +0100
++++ live-boot-grml/components/9990-initramfs-tools.sh  2014-03-08 13:20:10.742978533 +0100
+@@ -52,14 +52,20 @@

        printf "\n\n"
        printf "  \033[1;37mBOOT FAILED!\033[0m\n"
        printf "\n"
        printf "\n\n"
        printf "  \033[1;37mBOOT FAILED!\033[0m\n"
        printf "\n"

diff --git a/debian/patches/08_grml_defaults.patch b/debian/patches/08_grml_defaults.patch
index c28471f..1784e75 100644 (file)
--- a/debian/patches/08_grml_defaults.patch
+++ b/debian/patches/08_grml_defaults.patch
@@ -5,9 +5,11 @@
 ## DP: Pseudo-brand as grml
 
 @DPATCH@
 ## DP: Pseudo-brand as grml
 
 @DPATCH@

---- a/scripts/boot/9990-aaa-fixme.sh
-+++ b/scripts/boot/9990-aaa-fixme.sh
-@@ -9,7 +9,7 @@
+Index: live-boot-grml/components/9990-aaa-fixme.sh
+===================================================================
+--- live-boot-grml.orig/components/9990-aaa-fixme.sh   2014-03-08 13:20:56.901564329 +0100
++++ live-boot-grml/components/9990-aaa-fixme.sh        2014-03-08 13:20:56.897564798 +0100
+@@ -10,7 +10,7 @@

  alt_mountpoint="/media"
  LIVE_MEDIA_PATH="live"
  
  alt_mountpoint="/media"
  LIVE_MEDIA_PATH="live"
  


@@ -15,4 +17,4 @@
 +HOSTNAME="grml"
  
  mkdir -p "${mountpoint}"
 +HOSTNAME="grml"
  
  mkdir -p "${mountpoint}"

- tried="/tmp/tried"
+ mkdir -p /var/lib/live/boot

diff --git a/debian/patches/11_dhcphostname.patch b/debian/patches/11_dhcphostname.patch
index 965b3ac..65b72be 100644 (file)
--- a/debian/patches/11_dhcphostname.patch
+++ b/debian/patches/11_dhcphostname.patch
@@ -11,9 +11,11 @@ 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/boot/9990-cmdline-old
-+++ b/scripts/boot/9990-cmdline-old
-@@ -140,6 +140,11 @@ Cmdline_old ()
+Index: live-boot-grml/components/9990-cmdline-old
+===================================================================
+--- live-boot-grml.orig/components/9990-cmdline-old    2014-03-08 13:21:20.186833068 +0100
++++ live-boot-grml/components/9990-cmdline-old 2014-03-08 13:21:20.182833537 +0100
+@@ -140,6 +140,11 @@

                                export NFS_COW
                                ;;
  
                                export NFS_COW
                                ;;
  

diff --git a/debian/patches/12_uuid_support.patch b/debian/patches/12_uuid_support.patch
index 13d4ebe..646a19c 100644 (file)
--- a/debian/patches/12_uuid_support.patch
+++ b/debian/patches/12_uuid_support.patch
@@ -12,11 +12,11 @@
 ## DP: * no bootid.txt + ignore_bootid=...                => boots
 
 @DPATCH@
 ## DP: * no bootid.txt + ignore_bootid=...                => boots
 
 @DPATCH@

-Index: live-boot-grml/scripts/boot/9990-misc-helpers.sh
+Index: live-boot-grml/components/9990-misc-helpers.sh

 ===================================================================
 ===================================================================

---- live-boot-grml.orig/scripts/boot/9990-misc-helpers.sh      2013-08-15 08:01:04.303981714 +0200
-+++ live-boot-grml/scripts/boot/9990-misc-helpers.sh   2013-08-15 08:01:04.299981714 +0200
-@@ -20,6 +20,42 @@
+--- live-boot-grml.orig/components/9990-misc-helpers.sh        2014-03-08 13:25:32.293262071 +0100
++++ live-boot-grml/components/9990-misc-helpers.sh     2014-03-08 13:25:32.289262541 +0100
+@@ -15,6 +15,42 @@

        return 1
  }
  
        return 1
  }
  


@@ -59,7 +59,7 @@ Index: live-boot-grml/scripts/boot/9990-misc-helpers.sh
  matches_uuid ()
  {
        if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
  matches_uuid ()
  {
        if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]

-@@ -219,7 +255,7 @@
+@@ -214,7 +250,7 @@

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


@@ -68,7 +68,7 @@ Index: live-boot-grml/scripts/boot/9990-misc-helpers.sh
                then
                        echo ${mountpoint}
                        return 0
                then
                        echo ${mountpoint}
                        return 0

-@@ -315,19 +351,6 @@
+@@ -310,19 +346,6 @@

                                        return 0
                                fi
                        done
                                        return 0
                                fi
                        done


@@ -88,10 +88,10 @@ Index: live-boot-grml/scripts/boot/9990-misc-helpers.sh
                fi
        done
  
                fi
        done
  

-Index: live-boot-grml/scripts/boot/9990-cmdline-old
+Index: live-boot-grml/components/9990-cmdline-old

 ===================================================================
 ===================================================================

---- live-boot-grml.orig/scripts/boot/9990-cmdline-old  2013-08-15 08:01:04.303981714 +0200
-+++ live-boot-grml/scripts/boot/9990-cmdline-old       2013-08-15 08:01:04.299981714 +0200
+--- live-boot-grml.orig/components/9990-cmdline-old    2014-03-08 13:25:32.293262071 +0100
++++ live-boot-grml/components/9990-cmdline-old 2014-03-08 13:25:32.289262541 +0100

 @@ -18,6 +18,11 @@
                                BOOTIF="${_PARAMETER#BOOTIF=}"
                                ;;
 @@ -18,6 +18,11 @@
                                BOOTIF="${_PARAMETER#BOOTIF=}"
                                ;;

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

-Index: live-boot-grml/scripts/boot/9990-initramfs-tools.sh
+Index: live-boot-grml/components/9990-initramfs-tools.sh

 ===================================================================
 ===================================================================

---- 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
+--- live-boot-grml.orig/components/9990-initramfs-tools.sh     2014-03-08 13:26:25.866978105 +0100
++++ live-boot-grml/components/9990-initramfs-tools.sh  2014-03-08 13:26:25.862978575 +0100

 @@ -2,6 +2,17 @@
  
  #set -e
 @@ -2,6 +2,17 @@
  
  #set -e

diff --git a/debian/patches/15_networking_grml.patch b/debian/patches/15_networking_grml.patch
index f8aef45..7de1883 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/boot/9990-grml-networking.sh
+Index: live-boot-grml/components/9990-grml-networking.sh
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ live-boot-grml/components/9990-grml-networking.sh  2014-03-08 13:26:53.959682953 +0100

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


@@ -105,9 +107,11 @@ diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_
 +done
 +
 +}
 +done
 +
 +}

---- a/scripts/boot/9990-main.sh
-+++ b/scripts/boot/9990-main.sh
-@@ -197,6 +197,8 @@
+Index: live-boot-grml/components/9990-main.sh
+===================================================================
+--- live-boot-grml.orig/components/9990-main.sh        2014-03-08 13:26:53.963682483 +0100
++++ live-boot-grml/components/9990-main.sh     2014-03-08 13:26:53.959682953 +0100
+@@ -195,6 +195,8 @@

  
        Swap
  
  
        Swap
  

diff --git a/debian/patches/16_nodhcp.patch b/debian/patches/16_nodhcp.patch
index 1fe1282..a50cf82 100644 (file)
--- a/debian/patches/16_nodhcp.patch
+++ b/debian/patches/16_nodhcp.patch
@@ -6,8 +6,10 @@
 
 @DPATCH@
 
 
 @DPATCH@
 

---- a/scripts/boot/9990-cmdline-old
-+++ b/scripts/boot/9990-cmdline-old
+Index: live-boot-grml/components/9990-cmdline-old
+===================================================================
+--- live-boot-grml.orig/components/9990-cmdline-old    2014-03-08 13:28:01.059812396 +0100
++++ live-boot-grml/components/9990-cmdline-old 2014-03-08 13:28:01.055812866 +0100

 @@ -33,6 +33,8 @@
                        nodhcp)
                                DHCP=""
 @@ -33,6 +33,8 @@
                        nodhcp)
                                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 b2fe5ef..5f3f3ff 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,17 +27,8 @@
 @DPATCH@
 
 index d79beed..1b6926e 100755
 @DPATCH@
 
 index d79beed..1b6926e 100755

---- a/scripts/boot/9990-toram-todisk.sh
-+++ b/scripts/boot/9990-toram-todisk.sh
-@@ -10,7 +10,7 @@
- 
-       if [ -z "${MODULETORAM}" ]
-       then
--              size=$(fs_size "" ${copyfrom}/${LIVE_MEDIA_PATH} "used")
-+              size=$(fs_size "" ${copyfrom}/ "used")
-       else
-               MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
- 
+--- a/components/9990-toram-todisk.sh
++++ b/components/9990-toram-todisk.sh

 @@ -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
 @@ -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

diff --git a/debian/patches/26_support_dns_bootoption.patch b/debian/patches/26_support_dns_bootoption.patch
index aad51f1..1e17c3e 100644 (file)
--- a/debian/patches/26_support_dns_bootoption.patch
+++ b/debian/patches/26_support_dns_bootoption.patch
@@ -5,11 +5,11 @@
 ## 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@

-Index: live-boot-grml/scripts/boot/9990-networking.sh
+Index: live-boot-grml/components/9990-networking.sh

 ===================================================================
 ===================================================================

---- live-boot-grml.orig/scripts/boot/9990-networking.sh        2013-08-15 08:01:43.007980354 +0200
-+++ live-boot-grml/scripts/boot/9990-networking.sh     2013-08-15 08:01:43.007980354 +0200
-@@ -152,7 +152,7 @@
+--- live-boot-grml.orig/components/9990-networking.sh  2014-03-08 13:33:11.615385566 +0100
++++ live-boot-grml/components/9990-networking.sh       2014-03-08 13:33:11.611386038 +0100
+@@ -151,7 +151,7 @@

                                echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
                        fi
  
                                echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
                        fi
  


@@ -18,10 +18,10 @@ Index: live-boot-grml/scripts/boot/9990-networking.sh
                        do
                                if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
                                then
                        do
                                if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
                                then

-Index: live-boot-grml/scripts/boot/9990-grml-networking.sh
+Index: live-boot-grml/components/9990-grml-networking.sh

 ===================================================================
 ===================================================================

---- live-boot-grml.orig/scripts/boot/9990-grml-networking.sh   2013-08-15 08:01:43.007980354 +0200
-+++ live-boot-grml/scripts/boot/9990-grml-networking.sh        2013-08-15 08:01:43.007980354 +0200
+--- live-boot-grml.orig/components/9990-grml-networking.sh     2014-03-08 13:33:11.615385566 +0100
++++ live-boot-grml/components/9990-grml-networking.sh  2014-03-08 13:33:11.611386038 +0100

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


@@ -55,10 +55,10 @@ Index: live-boot-grml/scripts/boot/9990-grml-networking.sh
 +fi
 +
  }
 +fi
 +
  }

-Index: live-boot-grml/scripts/boot/9990-cmdline-old
+Index: live-boot-grml/components/9990-cmdline-old

 ===================================================================
 ===================================================================

---- live-boot-grml.orig/scripts/boot/9990-cmdline-old  2013-08-15 08:01:43.007980354 +0200
-+++ live-boot-grml/scripts/boot/9990-cmdline-old       2013-08-15 08:01:43.007980354 +0200
+--- live-boot-grml.orig/components/9990-cmdline-old    2014-03-08 13:33:11.615385566 +0100
++++ live-boot-grml/components/9990-cmdline-old 2014-03-08 13:33:11.611386038 +0100

 @@ -18,6 +18,19 @@
                                BOOTIF="${_PARAMETER#BOOTIF=}"
                                ;;
 @@ -18,6 +18,19 @@
                                BOOTIF="${_PARAMETER#BOOTIF=}"
                                ;;

diff --git a/debian/patches/27_support_static_ip.patch b/debian/patches/27_support_static_ip.patch
index d57ac8e..77bec78 100644 (file)
--- a/debian/patches/27_support_static_ip.patch
+++ b/debian/patches/27_support_static_ip.patch
@@ -6,21 +6,21 @@
 
 @DPATCH@
 
 
 @DPATCH@
 

-Index: live-boot-grml/scripts/boot/9990-networking.sh
+Index: live-boot-grml/components/9990-networking.sh

 ===================================================================
 ===================================================================

---- live-boot-grml.orig/scripts/boot/9990-networking.sh        2013-08-15 08:04:49.299973806 +0200
-+++ live-boot-grml/scripts/boot/9990-networking.sh     2013-08-15 08:29:13.959972623 +0200
+--- live-boot-grml.orig/components/9990-networking.sh  2014-03-08 13:35:17.832580835 +0100
++++ live-boot-grml/components/9990-networking.sh       2014-03-08 13:35:33.106789237 +0100

 @@ -44,7 +44,7 @@
  
 @@ -44,7 +44,7 @@
  

-                       if [ "$bootif_mac" = "$current_mac" ]
-                       then
--                              DEVICE=${device##*/}
-+                              ETHDEVICE="${device##*/},$ETHDEVICE" # use ethdevice
-                               break
+                               if [ "$bootif_mac" = "$current_mac" ]
+                               then
+-                                      DEVICE=${device##*/}
++                                      ETHDEVICE="${device##*/},$ETHDEVICE" # use ethdevice
+                                       break
+                               fi

                        fi
                        fi

-               fi
-@@ -53,6 +53,24 @@
- 
+@@ -52,6 +52,24 @@
+       fi

  }
  
 +get_ipconfig_para()
  }
  
 +get_ipconfig_para()


@@ -44,7 +44,7 @@ Index: live-boot-grml/scripts/boot/9990-networking.sh
  do_netsetup ()
  {
        modprobe -q af_packet # For DHCP
  do_netsetup ()
  {
        modprobe -q af_packet # For DHCP

-@@ -63,8 +81,20 @@
+@@ -62,8 +80,20 @@

        [ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
        echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
  
        [ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
        echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
  


@@ -67,7 +67,7 @@ Index: live-boot-grml/scripts/boot/9990-networking.sh
                # See if we can select the device from BOOTIF
                Device_from_bootif
  
                # See if we can select the device from BOOTIF
                Device_from_bootif
  

-@@ -74,14 +104,7 @@
+@@ -73,14 +103,7 @@

                if [ -z "$ETHDEVICE" ]
                then
                        echo "If you want to boot from a specific device use bootoption ethdevice=..."
                if [ -z "$ETHDEVICE" ]
                then
                        echo "If you want to boot from a specific device use bootoption ethdevice=..."


@@ -83,7 +83,7 @@ Index: live-boot-grml/scripts/boot/9990-networking.sh
                fi
  
                # split args of ethdevice=eth0,eth1 into "eth0 eth1"
                fi
  
                # split args of ethdevice=eth0,eth1 into "eth0 eth1"

-@@ -90,42 +113,29 @@
+@@ -89,42 +112,29 @@

                        devlist="$devlist $device"
                done
  
                        devlist="$devlist $device"
                done
  


@@ -116,21 +116,21 @@ Index: live-boot-grml/scripts/boot/9990-networking.sh
 -                      then
 -                              export DEVICE="$dev"
 -                              break
 -                      then
 -                              export DEVICE="$dev"
 -                              break

--                      fi
++
++                      IPV4ADDR="0.0.0.0"
++                      if [ -e "/run/net-${device}.conf" ]; then
++                              . /run/net-${device}.conf
+                       fi

 -              done
 -      else
 -              for interface in ${DEVICE}; do
 -                      ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config
 -
 -                      [ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf
 -              done
 -      else
 -              for interface in ${DEVICE}; do
 -                      ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config
 -
 -                      [ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf

- 
+-

 -                      if [ "$IPV4ADDR" != "0.0.0.0" ]
 -                      then
 -                              break
 -                      if [ "$IPV4ADDR" != "0.0.0.0" ]
 -                      then
 -                              break

-+                      IPV4ADDR="0.0.0.0"
-+                      if [ -e "/run/net-${device}.conf" ]; then
-+                              . /run/net-${device}.conf
-+                      fi

 +                      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


@@ -141,10 +141,10 @@ Index: live-boot-grml/scripts/boot/9990-networking.sh
  
        for interface in ${DEVICE}
        do
  
        for interface in ${DEVICE}
        do

-Index: live-boot-grml/scripts/boot/9990-cmdline-old
+Index: live-boot-grml/components/9990-cmdline-old

 ===================================================================
 ===================================================================

---- live-boot-grml.orig/scripts/boot/9990-cmdline-old  2013-08-15 08:04:49.299973806 +0200
-+++ live-boot-grml/scripts/boot/9990-cmdline-old       2013-08-15 08:04:49.295973806 +0200
+--- live-boot-grml.orig/components/9990-cmdline-old    2014-03-08 13:35:17.832580835 +0100
++++ live-boot-grml/components/9990-cmdline-old 2014-03-08 13:35:17.828581304 +0100

 @@ -51,9 +51,8 @@
                                ;;
  
 @@ -51,9 +51,8 @@
                                ;;
  

diff --git a/debian/patches/29_support_dns_in_initramfs.patch b/debian/patches/29_support_dns_in_initramfs.patch
index ca3c12a..501c607 100644 (file)
--- a/debian/patches/29_support_dns_in_initramfs.patch
+++ b/debian/patches/29_support_dns_in_initramfs.patch
@@ -6,9 +6,11 @@ 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/backends/initramfs-tools/live.hook
-+++ b/backends/initramfs-tools/live.hook
-@@ -225,23 +225,19 @@
+Index: live-boot-grml/backend/initramfs-tools/live.hook
+===================================================================
+--- live-boot-grml.orig/backend/initramfs-tools/live.hook      2014-03-08 13:36:37.835196873 +0100
++++ live-boot-grml/backend/initramfs-tools/live.hook   2014-03-08 13:36:37.835196873 +0100
+@@ -228,23 +228,19 @@

  
  # Some experimental stuff
  
  
  # Some experimental stuff
  

diff --git a/debian/patches/31_package_rename.patch b/debian/patches/31_package_rename.patch
index 893f1d7..7bd598b 100644 (file)
--- a/debian/patches/31_package_rename.patch
+++ b/debian/patches/31_package_rename.patch
@@ -1,7 +1,9 @@
---- a/Makefile
-+++ b/Makefile
-@@ -52,8 +52,8 @@
-       cp backends/initramfs-tools/live.script $(DESTDIR)/usr/share/initramfs-tools/scripts/live
+Index: live-boot-grml/Makefile
+===================================================================
+--- live-boot-grml.orig/Makefile       2014-03-08 13:36:52.857434829 +0100
++++ live-boot-grml/Makefile    2014-03-08 13:36:52.853435298 +0100
+@@ -55,8 +55,8 @@
+       cp frontend/* $(DESTDIR)/bin

  
        # Installing docs
 -      mkdir -p $(DESTDIR)/usr/share/doc/live-boot
  
        # Installing docs
 -      mkdir -p $(DESTDIR)/usr/share/doc/live-boot


@@ -11,7 +13,7 @@
  
        # Installing manpages
        for MANPAGE in manpages/en/*; \
  
        # Installing manpages
        for MANPAGE in manpages/en/*; \

-@@ -86,7 +86,7 @@
+@@ -90,7 +90,7 @@

        rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true
  
        # Uninstalling docs
        rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true
  
        # Uninstalling docs

diff --git a/debian/patches/32_add_kms.patch b/debian/patches/32_add_kms.patch
index e85075a..f908dfe 100644 (file)
--- a/debian/patches/32_add_kms.patch
+++ b/debian/patches/32_add_kms.patch
@@ -1,7 +1,7 @@
 Index: live-boot-grml/hooks/kms
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
 Index: live-boot-grml/hooks/kms
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000

-+++ live-boot-grml/backends/initramfs-tools/kms.hook   2011-12-06 22:09:55.000000000 +0100
++++ live-boot-grml/backend/initramfs-tools/kms.hook    2011-12-06 22:09:55.000000000 +0100

 @@ -0,0 +1,25 @@
 +#!/bin/sh
 +# hook for adding kms modules
 @@ -0,0 +1,25 @@
 +#!/bin/sh
 +# hook for adding kms modules

diff --git a/debian/patches/33_retry_phram.patch b/debian/patches/33_retry_phram.patch
index b124cbd..6d37640 100644 (file)
--- a/debian/patches/33_retry_phram.patch
+++ b/debian/patches/33_retry_phram.patch
@@ -7,9 +7,11 @@ Date:   Mon Jul 11 12:42:24 2011 +0200
     phram doesn't work on first modprobe, when loading once again it seems
     to work. So let's try it this way.
 
     phram doesn't work on first modprobe, when loading once again it seems
     to work. So let's try it this way.
 

---- a/scripts/boot/9990-main.sh
-+++ b/scripts/boot/9990-main.sh
-@@ -60,6 +60,7 @@
+Index: live-boot-grml/components/9990-main.sh
+===================================================================
+--- live-boot-grml.orig/components/9990-main.sh        2014-03-08 13:38:03.673128454 +0100
++++ live-boot-grml/components/9990-main.sh     2014-03-08 13:38:03.669128922 +0100
+@@ -58,6 +58,7 @@

                                then
                                        # We found a memdisk, set up phram
                                        modprobe phram phram=memdisk,${MEMDISK}
                                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 2e55d7f..05f4387 100644 (file)
--- a/debian/patches/34_ignore_unknown_filesystems.patch
+++ b/debian/patches/34_ignore_unknown_filesystems.patch
@@ -1,6 +1,8 @@
---- a/scripts/boot/9990-misc-helpers.sh
-+++ b/scripts/boot/9990-misc-helpers.sh
-@@ -463,6 +463,12 @@
+Index: live-boot-grml/components/9990-misc-helpers.sh
+===================================================================
+--- live-boot-grml.orig/components/9990-misc-helpers.sh        2014-03-08 13:38:26.286476006 +0100
++++ live-boot-grml/components/9990-misc-helpers.sh     2014-03-08 13:38:26.282476475 +0100
+@@ -443,6 +443,12 @@

                return 1
        fi
  
                return 1
        fi
  

diff --git a/debian/patches/36_support_dhcp_bootoption.patch b/debian/patches/36_support_dhcp_bootoption.patch
index 9c81a2e..ad416e3 100644 (file)
--- a/debian/patches/36_support_dhcp_bootoption.patch
+++ b/debian/patches/36_support_dhcp_bootoption.patch
@@ -1,5 +1,5 @@
---- a/scripts/boot/9990-grml-networking.sh
-+++ b/scripts/boot/9990-grml-networking.sh
+--- a/components/9990-grml-networking.sh
++++ b/components/9990-grml-networking.sh

 @@ -59,6 +59,14 @@
          method="manual"
      fi
 @@ -59,6 +59,14 @@
          method="manual"
      fi

diff --git a/debian/patches/39_persistence_with_forensic.patch b/debian/patches/39_persistence_with_forensic.patch
index 00dc3dd..e83ccb2 100644 (file)
--- a/debian/patches/39_persistence_with_forensic.patch
+++ b/debian/patches/39_persistence_with_forensic.patch
@@ -1,5 +1,5 @@
---- a/scripts/boot/0020-read-only
-+++ b/scripts/boot/0020-read-only
+--- a/components/0020-read-only
++++ b/components/0020-read-only

 @@ -53,4 +53,20 @@
                                ;;
                esac
 @@ -53,4 +53,20 @@
                                ;;
                esac

diff --git a/debian/patches/40_support_multiple_hooks.patch b/debian/patches/40_support_multiple_hooks.patch
index ffdd399..ae7b111 100644 (file)
--- a/debian/patches/40_support_multiple_hooks.patch
+++ b/debian/patches/40_support_multiple_hooks.patch
@@ -1,18 +1,20 @@
---- a/Makefile
-+++ b/Makefile
+Index: live-boot-grml/Makefile
+===================================================================
+--- live-boot-grml.orig/Makefile       2014-03-08 13:42:04.748851311 +0100
++++ live-boot-grml/Makefile    2014-03-08 13:42:04.744851781 +0100

 @@ -47,9 +47,13 @@
  
        # Installing executables
        mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks
 @@ -47,9 +47,13 @@
  
        # Installing executables
        mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks

--      cp backends/initramfs-tools/live.hook $(DESTDIR)/usr/share/initramfs-tools/hooks/live
-+      for f in backends/initramfs-tools/*.hook; do \
+-      cp backend/initramfs-tools/live.hook $(DESTDIR)/usr/share/initramfs-tools/hooks/live
++      for f in backend/initramfs-tools/*.hook; do \

 +              cp $${f} $(DESTDIR)/usr/share/initramfs-tools/hooks/$$(basename $${f} .hook); \
 +      done
        mkdir -p $(DESTDIR)/usr/share/initramfs-tools/scripts
 +              cp $${f} $(DESTDIR)/usr/share/initramfs-tools/hooks/$$(basename $${f} .hook); \
 +      done
        mkdir -p $(DESTDIR)/usr/share/initramfs-tools/scripts

--      cp backends/initramfs-tools/live.script $(DESTDIR)/usr/share/initramfs-tools/scripts/live
-+      for f in backends/initramfs-tools/*.script; do \
+-      cp backend/initramfs-tools/live.script $(DESTDIR)/usr/share/initramfs-tools/scripts/live
++      for f in backend/initramfs-tools/*.script; do \

 +              cp $${f} $(DESTDIR)/usr/share/initramfs-tools/scripts/$$(basename $${f} .script); \
 +      done
  
 +              cp $${f} $(DESTDIR)/usr/share/initramfs-tools/scripts/$$(basename $${f} .script); \
 +      done
  

-       # Installing docs
-       mkdir -p $(DESTDIR)/usr/share/doc/live-boot-grml
+       mkdir -p $(DESTDIR)/bin
+       cp frontend/* $(DESTDIR)/bin

diff --git a/debian/patches/41_drop_nameserver_from_ip_option.patch b/debian/patches/41_drop_nameserver_from_ip_option.patch
index f43cfc4..2f2f6bf 100644 (file)
--- a/debian/patches/41_drop_nameserver_from_ip_option.patch
+++ b/debian/patches/41_drop_nameserver_from_ip_option.patch
@@ -11,8 +11,8 @@ option inside the ip= boot parameter.
 This violates the ip= handling as documented in
 https://www.kernel.org/doc/Documentation/filesystems/nfs/nfsroot.txt
 
 This violates the ip= handling as documented in
 https://www.kernel.org/doc/Documentation/filesystems/nfs/nfsroot.txt
 

---- a/scripts/boot/9990-netbase.sh
-+++ b/scripts/boot/9990-netbase.sh
+--- a/components/9990-netbase.sh
++++ b/components/9990-netbase.sh

 @@ -44,7 +44,6 @@
                        ifaddress="$(echo ${ifline} | cut -f2 -d ':')"
                        ifnetmask="$(echo ${ifline} | cut -f3 -d ':')"
 @@ -44,7 +44,6 @@
                        ifaddress="$(echo ${ifline} | cut -f2 -d ':')"
                        ifnetmask="$(echo ${ifline} | cut -f3 -d ':')"

diff --git a/debian/patches/42_restore_support_for_old_persistence.patch b/debian/patches/42_restore_support_for_old_persistence.patch
index c86ef88..4e2a12c 100644 (file)
--- a/debian/patches/42_restore_support_for_old_persistence.patch
+++ b/debian/patches/42_restore_support_for_old_persistence.patch
@@ -1,10 +1,12 @@
 From: Evgeni Golov <evgeni@debian.org>
 Subject: restore support for old persistence media
 
 From: Evgeni Golov <evgeni@debian.org>
 Subject: restore support for old persistence media
 

---- a/scripts/boot/9990-aaa-fixme.sh
-+++ b/scripts/boot/9990-aaa-fixme.sh
-@@ -40,7 +40,10 @@
-       udevinfo='udevinfo'
+Index: live-boot-grml/components/9990-aaa-fixme.sh
+===================================================================
+--- live-boot-grml.orig/components/9990-aaa-fixme.sh   2014-03-08 13:43:19.172121783 +0100
++++ live-boot-grml/components/9990-aaa-fixme.sh        2014-03-08 13:43:19.164122722 +0100
+@@ -26,5 +26,8 @@
+       export PATH

  fi
  
 +old_root_overlay_label="live-rw"
  fi
  
 +old_root_overlay_label="live-rw"


@@ -12,11 +14,11 @@ Subject: restore support for old persistence media
  custom_overlay_label="persistence"
 +old_custom_overlay_label="custom-ov"
  persistence_list="persistence.conf"
  custom_overlay_label="persistence"
 +old_custom_overlay_label="custom-ov"
  persistence_list="persistence.conf"

- old_persistence_list="live-persistence.conf"
- 
---- a/scripts/boot/9990-misc-helpers.sh
-+++ b/scripts/boot/9990-misc-helpers.sh
-@@ -1582,6 +1582,32 @@
+Index: live-boot-grml/components/9990-misc-helpers.sh
+===================================================================
+--- live-boot-grml.orig/components/9990-misc-helpers.sh        2014-03-08 13:43:19.172121783 +0100
++++ live-boot-grml/components/9990-misc-helpers.sh     2014-03-08 13:43:19.168122252 +0100
+@@ -1632,6 +1632,32 @@

        echo ${used_devices}
  }
  
        echo ${used_devices}
  }
  


@@ -49,8 +51,10 @@ Subject: restore support for old persistence media
  is_mountpoint ()
  {
        directory="$1"
  is_mountpoint ()
  {
        directory="$1"

---- a/scripts/boot/9990-overlay.sh
-+++ b/scripts/boot/9990-overlay.sh
+Index: live-boot-grml/components/9990-overlay.sh
+===================================================================
+--- live-boot-grml.orig/components/9990-overlay.sh     2014-03-08 13:43:19.172121783 +0100
++++ live-boot-grml/components/9990-overlay.sh  2014-03-08 13:43:19.168122252 +0100

 @@ -210,7 +210,7 @@
  
                if is_in_comma_sep_list overlay ${PERSISTENCE_METHOD}
 @@ -210,7 +210,7 @@
  
                if is_in_comma_sep_list overlay ${PERSISTENCE_METHOD}

diff --git a/debian/patches/43_fix_udev_usage_in_is_nice_device.patch b/debian/patches/43_fix_udev_usage_in_is_nice_device.patch
deleted file mode 100644 (file)
index 9afca56..0000000
--- a/debian/patches/43_fix_udev_usage_in_is_nice_device.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scripts/boot/9990-misc-helpers.sh
-+++ b/scripts/boot/9990-misc-helpers.sh
-@@ -117,7 +117,7 @@
- {
-       sysfs_path="${1#/sys}"
- 
--      if /sbin/udevadm test-builtin path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)"
-+      if /sbin/udevadm info --query=all --path="${sysfs_path}" | egrep -q "DEVTYPE=disk"
-       then
-               return 0
-       elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'

diff --git a/debian/patches/44_fix_mdadm_usage_for_findiso.patch b/debian/patches/44_fix_mdadm_usage_for_findiso.patch
deleted file mode 100644 (file)
index cc4ef34..0000000
--- a/debian/patches/44_fix_mdadm_usage_for_findiso.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/scripts/boot/9990-misc-helpers.sh
-+++ b/scripts/boot/9990-misc-helpers.sh
-@@ -202,7 +202,7 @@
-                               # Adding lvm support
-                               if [ -x /scripts/local-top/lvm2 ]
-                               then
--                                      ROOT="$device" resume="" /scripts/local-top/lvm2
-+                                      ROOT="$device" resume="" /scripts/local-top/lvm2 >>/boot.log
-                               fi
-                               ;;
- 
-@@ -210,10 +210,10 @@
-                               # Adding raid support
-                               if [ -x /scripts/local-top/mdadm ]
-                               then
--                                      cp /conf/conf.d/md /conf/conf.d/md.orig
-+                                      [ -r /conf/conf.d/md ] && cp /conf/conf.d/md /conf/conf.d/md.orig
-                                       echo "MD_DEVS=$device " >> /conf/conf.d/md
--                                      /scripts/local-top/mdadm
--                                      mv /conf/conf.d/md.orig /conf/conf.d/md
-+                                      /scripts/local-top/mdadm >>/boot.log
-+                                      [ -r /conf/conf.d/md.orig ] && mv /conf/conf.d/md.orig /conf/conf.d/md
-                               fi
-                               ;;
-               esac

diff --git a/debian/patches/series b/debian/patches/series
index b7a5c6d..4ddef73 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,5 +19,3 @@
 40_support_multiple_hooks.patch
 41_drop_nameserver_from_ip_option.patch
 42_restore_support_for_old_persistence.patch
 40_support_multiple_hooks.patch
 41_drop_nameserver_from_ip_option.patch
 42_restore_support_for_old_persistence.patch

-43_fix_udev_usage_in_is_nice_device.patch
-44_fix_mdadm_usage_for_findiso.patch