Merge remote-tracking branch 'upstream/master'

git://anonscm.debian.org/debian-live/live-boot.git

 Conflicts:
	backend/initramfs-tools/live.hook
	components/9990-cmdline-old
	debian/changelog
	debian/control

diff --combined backend/initramfs-tools/live.hook
index d5765bb,54a566f..9c2ec69
--- 1/backend/initramfs-tools/live.hook
--- 2/backend/initramfs-tools/live.hook
+++ b/backend/initramfs-tools/live.hook
@@@ -16,12 -16,6 +16,12 @@@ d
        fi
  done
  
 +# Grml version information:
 +if [ -r /etc/grml_version ]
 +then
 +       cp /etc/grml_version "${DESTDIR}"/etc
 +fi
 +
  # Checking live-boot
  if [ ! -e /bin/live-boot ]
  then
@@@ -39,6 -33,16 +39,16 @@@ cp -a /bin/live-boot /lib/live/boot "${
  mkdir -p "${DESTDIR}/lib/live"
  cp -a /lib/live/boot "${DESTDIR}/lib/live"
  
+ mkdir -p "${DESTDIR}/etc/live"
+ if [ -e /etc/live/boot.conf ]
+ then
+       cp -a /etc/live/boot.conf "${DESTDIR}/etc/live"
+ fi
+ if [ -e /etc/live/boot ]
+ then
+       cp -a /etc/live/boot "${DESTDIR}/etc/live"
+ fi
+ 
  # klibc dependencies
  for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
  do
@@@ -119,6 -123,7 +129,7 @@@ manual_add_modules overla
  manual_add_modules nls_cp437
  manual_add_modules nls_iso8859-1
  manual_add_modules nls_utf8
+ manual_add_modules nls_ascii
  manual_add_modules vfat
  
  # Filesystem: ntfs
@@@ -236,11 -241,4 +247,11 @@@ don
  #mkdir -p "${DESTDIR}/etc"
  #cp -p /etc/nsswitch.conf "${DESTDIR}/etc"
  
 +# vlan support
 +if [ -x /sbin/vconfig ]
 +then
 +      copy_exec /sbin/vconfig
 +      manual_add_modules 8021q
 +fi
 +
  [ "${QUIET}" ] || echo .

diff --combined components/9990-misc-helpers.sh
index f3e4d72,ee53b16..6522682
--- 1/components/9990-misc-helpers.sh
--- 2/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@@ -15,42 -15,6 +15,42 @@@ is_live_path(
        return 1
  }
  
 +grml_match_bootid()
 +{
 +      path="$1"
 +
 +      if [ -n "$IGNORE_BOOTID" ] ; then
 +              echo " * Ignoring verification of bootid.txt as requested via ignore_bootid.">>/boot.log
 +              return 0
 +      fi
 +
 +      if [ -n "$BOOTID" ] && ! [ -r "${path}/conf/bootid.txt" ] ; then
 +              echo "  * Warning: bootid=... specified but no bootid.txt found on currently requested device.">>/boot.log
 +              return 1
 +      fi
 +
 +      [ -r "${path}/conf/bootid.txt" ] || return 0
 +
 +      bootid_conf=$(cat "${path}/conf/bootid.txt")
 +
 +      if [ -z "$BOOTID" -a -z "$IGNORE_BOOTID" ]
 +      then
 +              echo " * Warning: bootid.txt found but ignore_bootid / bootid=.. bootoption missing...">>/boot.log
 +              return 1
 +      fi
 +
 +      if [ "$BOOTID" = "$bootid_conf" ]
 +      then
 +              echo " * Successfully verified /conf/bootid.txt from ISO, continuing... ">>/boot.log
 +      else
 +              echo " * Warning: BOOTID of ISO does not match. Retrying and continuing search...">>/boot.log
 +              return 1
 +      fi
 +
 +      return 0
 +}
 +
 +
  matches_uuid ()
  {
        if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
@@@ -250,7 -214,7 +250,7 @@@ check_dev (
                fi
  
                if is_live_path ${mountpoint} && \
 -                      ([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint})
 +                      ([ "${skip_uuid_check}" ] || grml_match_bootid ${mountpoint})
                then
                        echo ${mountpoint}
                        return 0
@@@ -346,6 -310,19 +346,6 @@@ find_livefs (
                                        return 0
                                fi
                        done
 -              elif [ "${fstype}" = "squashfs" -o \
 -                      "${fstype}" = "btrfs" -o \
 -                      "${fstype}" = "ext2" -o \
 -                      "${fstype}" = "ext3" -o \
 -                      "${fstype}" = "ext4" -o \
 -                      "${fstype}" = "jffs2" ]
 -              then
 -                      # This is an ugly hack situation, the block device has
 -                      # an image directly on it.  It's hopefully
 -                      # live-boot, so take it and run with it.
 -                      ln -s "${devname}" "${devname}.${fstype}"
 -                      echo "${devname}.${fstype}"
 -                      return 0
                fi
        done
  
@@@ -1192,6 -1169,10 +1192,10 @@@ removable_dev (
  
        for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
        do
+               if [ ! -d "${sysblock}" ]; then
+                       continue
+               fi
+ 
                dev_ok=
                if [ "$(cat ${sysblock}/removable)" = "1" ]
                then
@@@ -1237,6 -1218,10 +1241,10 @@@ non_removable_dev (
  
        for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
        do
+               if [ ! -d "${sysblock}" ]; then
+                       continue
+               fi
+ 
                if [ "$(cat ${sysblock}/removable)" = "0" ]
                then
                        case "${output_format}" in

diff --combined components/9990-netbase.sh
index df8d080,04a4ae4..c463cc0
--- 1/components/9990-netbase.sh
--- 2/components/9990-netbase.sh
+++ b/components/9990-netbase.sh
@@@ -49,6 -49,7 +49,6 @@@ EO
                        ifaddress="$(echo ${ifline} | cut -f2 -d ':')"
                        ifnetmask="$(echo ${ifline} | cut -f3 -d ':')"
                        ifgateway="$(echo ${ifline} | cut -f4 -d ':')"
 -                      nameserver="$(echo ${ifline} | cut -f5 -d ':')"
  
  cat >> "${IFFILE}" << EOF
  allow-hotplug ${ifname}
@@@ -66,9 -67,24 +66,13 @@@ cat >> "${IFFILE}" << EO
  EOF
  
                        fi
 -
 -                      if [ -n "${nameserver}" ]
 -                      then
 -                              if [ -e "${DNSFILE}" ]
 -                              then
 -                                      grep -v ^nameserver "${DNSFILE}" > "${DNSFILE}.tmp"
 -                                      mv "${DNSFILE}.tmp" "${DNSFILE}"
 -                              fi
 -
 -                              echo "nameserver ${nameserver}" >> "${DNSFILE}"
 -                      fi
                done
        else
-               if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
+               if [ -n "${NODHCP}" ]
+               then
+                       # force DHCP off
+                       method="manual"
+               elif [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
                then
                        # default, dhcp assigned
                        method="dhcp"

diff --combined debian/changelog
index 0b575da,bfbaba6..653b7e0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,53 -1,20 +1,70 @@@
+ live-boot (1:20170112) unstable; urgency=medium
+ 
+   [ Raphaël Hertzog ]
+   * Team upload.
+   * Fix nodhcp option to actually force DHCP off. Closes: #785345
+     Thanks to Frank Lillo for the report and Evgeni Golov for the patch.
+   * Improve 9990-misc-helpers.sh when /sys/block/ is empty.
+     Closes: #847802
+   * Multiple cleanups to appease lintian.
+ 
+   [ Kristian Klausen ]
+   * Add "nls_ascii" module in the initrd so that we can access FAT
+     partitions. Closes: #850532
+   * Copy /etc/live/boot.conf and /etc/live/boot to the initrd.
+ 
+  -- Raphaël Hertzog <hertzog@debian.org>  Thu, 12 Jan 2017 16:59:49 +0100
+ 
 +live-boot (1:20160511+grml.1) unstable; urgency=medium
 +
 +  The "capetown AKA debconf16" release
 +
 +  [ Evgeni Golov ]
 +  * [d7a4f37] allow the use of multiple initramfs hooks and scripts again
 +  * [16ee41d] make copying libnss_dns.so.* unconditionally
 +  * [11a6c11] fix detection of (no)persistence option in read-only mode
 +  * [03fc557] update manpages with default overlay filesystem
 +
 +  [ Ulrich Dangel ]
 +  * [f747483] Add kms modules to initramfs
 +
 +  [ Michael Prokop ]
 +  * [1799c46] Try loading phram module twice to fix loading issue.
 +  * [ac5eb22] Revert toram bootoption to expected behaviour.
 +  * [e3cbd82] Enable write-mode for persistency related devices in
 +    readonly/forensic mode
 +  * [da50dd4] ignore "unknown" filesystems in is_supported_fs()
 +  * [6f465dd] Support dns bootoption.
 +  * [de513c1] Drop deprecated live-boot-grml init script
 +  * [a00236b] debian/rules: drop deprecated build target
 +  * [54c3318] debian/rules: drop dpatch workaround which is no longer
 +    needed
 +  * [a4eba80] Drop dpkg trigger for update-initramfs
 +  * [010800e] Adjust permissions of backend/initramfs-tools/kms.hook
 +  * [7da805e] Bump Standards-Version to 3.9.8
 +  * [50ff238] Revert "Copy /etc/live/boot{,.conf} to initramfs"
 +
 +  [ Wolfgang Scheicher ]
 +  * [30b31df] Enable multiple lower layers for overlayfs
 +
 +  [ Russell Stuart ]
 +  * [4ec4294] default the host in fetch urls to be ROOTSERVER if it is
 +    blank (Closes: #800498)
 +
 +  [ Raphaël Hertzog ]
 +  * [e81e9c6] Update build system to rely on "dpkg-parsechangelog -S
 +    Version" instead of outdated VERSION file.
 +  * [e75ad2c] Fix typo in variable name
 +  * [3d23fca] No longer modify PATH to point to /root (Closes: #823069)
 +  * [cbf1f9d] Some fixups to ensure we work with busybox/klibc-utils
 +  * [3d30fee] Drop debian/source/*options and dh_builddeb override
 +  * [40bb20f] Prepare for release
 +
 +  [ Kristian Klausen ]
 +  * [b98d289] Copy /etc/live/boot{,.conf} to initramfs
 +
 + -- Michael Prokop <mika@grml.org>  Tue, 05 Jul 2016 19:36:14 +0200
 +
  live-boot (1:20160511) unstable; urgency=medium
  
    * Team upload.
@@@ -62,22 -29,6 +79,22 @@@
  
   -- Raphaël Hertzog <hertzog@debian.org>  Wed, 11 May 2016 11:40:37 +0200
  
 +live-boot (1:20151213+grml.1) unstable; urgency=medium
 +
 +  [ Evgeni Golov ]
 +  * Merge latest Debian changes.
 +  * [aea94ce] add gbp.conf
 +  * [9f0266a] fix "unexpected operator" error when stopping live-boot
 +  * [83abdd6] Revert "restore support for old persistence media"
 +  * [09d8468] remove debian/patches
 +  * [0c43d97] make package native as in Debian
 +  * [1a226f4] Revert "use auto instead of allow-hotplug in generated /e/n/interfaces"
 +
 +  [ Riccardo Murri ]
 +  * [3f6c7f2] Allow selecting boot eth dev by MAC address
 +
 + -- Evgeni Golov <evgeni@grml.org>  Thu, 07 Jan 2016 08:47:27 +0100
 +
  live-boot (1:20151213) unstable; urgency=medium
  
    [ Iain R. Learmonth ]
@@@ -116,27 -67,6 +133,27 @@@ live-boot (5.0~a5-1) unstable; urgency=
  
   -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 23 Aug 2015 10:55:32 +0200
  
 +live-boot (5.0~a4-1+grml.1) unstable; urgency=medium
 +
 +  [ Evgeni Golov ]
 +  * Import 5.0~a4-1 from Debian.
 +  * [3a7cc5f] drop stop-using-etc-fstab.d.patch, applied upstream
 +  * [ee5831d] Drop genext2fs from Depends, live-snapshot is long gone
 +  * [8e37c83] update 15_networking_grml.patch against live-boot 5.0
 +  * [600ec8b] do not run dh with quilt, we have source format 3.0
 +  * [26c670d] drop patches, we have everything in git now
 +  * [5f1c62a] create a single debian patch :/
 +  * [214cc03] use auto instead of allow-hotplug in generated /e/n/interfaces
 +    (Closes: issue1568)
 +  * [6795067] backport Allow-selecting-boot-eth-dev-by-MAC-address.patch
 +    from upstream
 +
 +  [ Laurens Vanderhoven ]
 +  * [5eb34d4] Allow +2 nameserver entries for dns= boot option
 +    (Closes: issue1234)
 +
 + -- Evgeni Golov <evgeni@grml.org>  Tue, 18 Aug 2015 14:14:10 +0200
 +
  live-boot (5.0~a4-1) unstable; urgency=low
  
    [ Tails developers ]
@@@ -218,26 -148,6 +235,26 @@@ live-boot (4.0.2-1) unstable; urgency=l
  
   -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 10 Dec 2014 10:36:04 +0100
  
 +live-boot (4.0.1-1+grml.3) unstable; urgency=medium
 +
 +  [ Evgeni Golov ]
 +  * [ca03a16] update stop-using-etc-fstab.d.patch to latest upstream
 +    version
 +
 + -- Michael Prokop <mika@grml.org>  Thu, 13 Nov 2014 09:56:07 +0100
 +
 +live-boot (4.0.1-1+grml.2) unstable; urgency=medium
 +
 +  * stop using /etc/fstab.d
 +
 + -- Evgeni Golov <evgeni@debian.org>  Thu, 30 Oct 2014 07:31:08 +0100
 +
 +live-boot (4.0.1-1+grml.1) unstable; urgency=medium
 +
 +  * Import 4.0.1-1 from Debian.
 +
 + -- Evgeni Golov <evgeni@grml.org>  Sun, 26 Oct 2014 11:31:59 +0100
 +
  live-boot (4.0.1-1) unstable; urgency=low
  
    [ victory ]
@@@ -255,12 -165,6 +272,12 @@@
  
   -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 25 Oct 2014 14:26:22 +0200
  
 +live-boot (4.0.0-1+grml.1) unstable; urgency=medium
 +
 +  * Import 4.0.0-1 from Debian.
 +
 + -- Evgeni Golov <evgeni@grml.org>  Thu, 28 Aug 2014 17:55:20 +0200
 +
  live-boot (4.0.0-1) unstable; urgency=low
  
    [ Carlos Zuferri ]
@@@ -274,12 -178,6 +291,12 @@@
  
   -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 27 Aug 2014 19:52:09 +0200
  
 +live-boot (4.0~alpha21-1+grml.1) UNRELEASED; urgency=medium
 +
 +  * Import 4.0~alpha21 from Debian.
 +
 + -- Evgeni Golov <evgeni@grml.org>  Thu, 10 Apr 2014 08:29:49 +0200
 +
  live-boot (4.0~alpha21-1) unstable; urgency=low
  
    * Building with dh --parallel.
@@@ -298,32 -196,6 +315,32 @@@ live-boot (4.0~alpha20-1) unstable; urg
  
   -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 31 Mar 2014 21:38:22 +0200
  
 +live-boot (4.0~alpha19-1+grml.3) unstable; urgency=medium
 +
 +  * [8acc928] try to be smarter when booting a squashfs image from
 +              the network and using resolvconf in it.
 +
 + -- Evgeni Golov <evgeni@grml.org>  Tue, 25 Mar 2014 17:49:22 +0100
 +
 +live-boot (4.0~alpha19-1+grml.2) unstable; urgency=medium
 +
 +  * [805c218] VLAN support via boot option "vlan=<vid>:<phydevice>"
 +
 + -- Michael Prokop <mika@grml.org>  Mon, 17 Mar 2014 23:43:24 +0100
 +
 +live-boot (4.0~alpha19-1+grml.1) unstable; urgency=medium
 +
 +  * Sync Debian's 4.0~alpha19-1.
 +  * 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
 +  * move Grml-specific patches to a separate subfolder
 +  * move reverts/restores of old upstream behaviour to an own subdir
 +  * consolidate Grml network related patches into 15_networking_grml.patch
 +
 + -- Evgeni Golov <evgeni@grml.org>  Sat, 08 Mar 2014 13:59:28 +0100
 +
  live-boot (4.0~alpha19-1) experimental; urgency=low
  
    * Updating copyright notices for 2014.
@@@ -443,49 -315,6 +460,49 @@@ live-boot (4.0~a14-1) experimental; urg
  
   -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 13 Sep 2013 14:17:30 +0200
  
 +live-boot (4.0~a13-1+grml.5) unstable; urgency=medium
 +
 +  * [3b54472] Add support for label "persistence" to forensic mode
 +
 + -- Michael Prokop <mika@grml.org>  Sat, 25 Jan 2014 11:45:16 +0100
 +
 +live-boot (4.0~a13-1+grml.4) unstable; urgency=low
 +
 +  * [3d46167] Add patch to properly boot from mdadm via findiso boot
 +    option [Closes: issue1270] Thanks to thinkgear for the bug report
 +    and providing a test VM
 +
 + -- Michael Prokop <mika@grml.org>  Tue, 15 Oct 2013 16:58:17 +0200
 +
 +live-boot (4.0~a13-1+grml.3) unstable; urgency=low
 +
 +  * [79dceec] Update 9990-misc-helpers.sh to support latest udev version
 +    [Closes: issue1278] Thanks to Michael Biebl <biebl@debian.org> for
 +    helping in resolve this issue and Ulrich Dangel <mru@spamt.net>
 +    for the initial patch
 +
 + -- Michael Prokop <mika@grml.org>  Sat, 28 Sep 2013 11:44:52 +0200
 +
 +live-boot (4.0~a13-1+grml.2) unstable; urgency=low
 +
 +  * [61895ec] Do not "exit" if boot option nonetworking is set but
 +    "return" instead [Closes: issue1276]
 +  * [85bddc0] Refresh debian/patches/
 +
 + -- Michael Prokop <mika@grml.org>  Fri, 20 Sep 2013 16:38:53 +0200
 +
 +live-boot (4.0~a13-1+grml.1) unstable; urgency=low
 +
 +  * Sync Debian's 4.0~a13.
 +  * [ba11a22] drop patches that were previously backported from
 +    the 4.x upstream branch
 +  * [5eca029, 3a80a92, eae4296, e6023f8] refresh patches against
 +    new upstream
 +  * [2130827] more forwardporting of deprecated persistence options
 +  * [c06cdf4] log to boot.log, not live-boot.log
 +
 + -- Evgeni Golov <evgeni@grml.org>  Sun, 18 Aug 2013 10:53:12 +0200
 +
  live-boot (4.0~a13-1) experimental; urgency=low
  
    * Increasing tftp blocksize to maximum value per RFC 2348, thanks to
@@@ -678,13 -507,6 +695,13 @@@ live-boot (4.0~a1-1) experimental; urge
  
   -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 30 Nov 2012 14:58:46 +0100
  
 +live-boot (3.0.1-1+grml.1) unstable; urgency=low
 +
 +  * Sync Debian's 3.0.1.
 +  * Backport some patches from Debian's debian-next (4.x) branch.
 +
 + -- Evgeni Golov <evgeni@grml.org>  Wed, 06 Mar 2013 08:07:07 +0100
 +
  live-boot (3.0.1-1) unstable; urgency=low
  
    [ chals ]
@@@ -742,16 -564,6 +759,16 @@@ live-boot (3.0~b11-1) unstable; urgency
  
   -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 02 Jan 2013 11:32:21 +0100
  
 +live-boot (3.0~b10-1+grml.1) unstable; urgency=low
 +
 +  [ Evgeni Golov ]
 +  * [795263e] refresh 29_support_dns_in_initramfs.patch against
 +    current upstream
 +  * [2045fef] drop 43_do_not_fix_mountpoints_with_live-persistence.patch,
 +    applied upstream
 +
 + -- Michael Prokop <mika@grml.org>  Tue, 18 Dec 2012 01:41:16 +0100
 +
  live-boot (3.0~b10-1) unstable; urgency=low
  
    [ Daniel Baumann ]
@@@ -777,23 -589,6 +794,23 @@@
  
   -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 17 Dec 2012 20:22:50 +0100
  
 +live-boot (3.0~b9-1+grml.1) unstable; urgency=low
 +
 +  [ Evgeni Golov ]
 +  * [bdc44cd] drop 37_fix_legacy_persistence_handling.patch, applied
 +    upstream
 +
 +  [ Michael Prokop ]
 +  * [1aa780a] Refresh patches against current master
 +  * [a133107] Add patch to drop nameserver handling from ip= boot
 +    parameter
 +  * [7782d4f] Add patch to restore support for persistence media with
 +    LABEL=custom-ov (credits to Evgeni)
 +  * [b7de9b2] Do not fix mountpoints with live-persistence.conf as
 +    home-rw/live-rw (credits to Evgeni)
 +
 + -- Michael Prokop <mika@grml.org>  Mon, 17 Dec 2012 18:22:27 +0100
 +
  live-boot (3.0~b9-1) unstable; urgency=low
  
    [ Tails developers ]
@@@ -804,16 -599,6 +821,16 @@@
  
   -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 10 Dec 2012 20:01:21 +0100
  
 +live-boot (3.0~b8-1+grml.1) unstable; urgency=low
 +
 +  The "sync with Debian's 3.0~b8-1 version" release
 +
 +  [ Evgeni Golov ]
 +  * [ce765d3] refresh patches against Debian's 3.0~b8-1
 +  * [b484d6d] allow the use of multiple initramfs hooks and scripts again
 +
 + -- Michael Prokop <mika@grml.org>  Thu, 06 Dec 2012 12:51:50 +0100
 +
  live-boot (3.0~b8-1) unstable; urgency=low
  
    * Removing eject from recommends, the script that ejects the live medium
@@@ -1148,76 -933,6 +1165,76 @@@ live-boot (3.0~a28-1) experimental; urg
  
   -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 04 Jun 2012 17:31:32 +0200
  
 +live-boot (3.0~a27-1+grml.7) grml-testing; urgency=low
 +
 +  * [a488db6] Enable write-mode for persistency related devices in
 +    readonly/forensic mode
 +
 + -- Michael Prokop <mika@grml.org>  Fri, 14 Sep 2012 17:01:39 +0200
 +
 +live-boot (3.0~a27-1+grml.6) grml-testing; urgency=low
 +
 +  [ Lukas Schwaighofer ]
 +  * [95fb70f] fixed legacy persistence handling
 +
 +  [ Michael Prokop ]
 +  * [ed79f48] readonly: do not check for "forensic" boot option
 +  * [72aebf1] Move changes to scripts/live-premount/readonly into debian
 +    patch file
 +
 + -- Michael Prokop <mika@grml.org>  Fri, 07 Sep 2012 13:43:08 +0200
 +
 +live-boot (3.0~a27-1+grml.5) grml-testing; urgency=low
 +
 +  * [8b51f69] Adjust 15_networking_grml.patch + 27_support_static_ip.patch
 +    for klibc's ipconfig /run switch
 +  * [bbeb928] Add "Breaks: klibc-utils (<< 2.0-2)" to live-boot-grml-
 +    initramfs-tools for /run switch
 +  * [cad0077] Refresh debian/patches/35_fix_findiso_umount.patch
 +  * [7f450c2] Support overriding "nodhcp" boot option via "dhcp"
 +  * [2b065a0] Adjust file permissions also of files that are added during
 +    dh_quilt_patch stage
 +
 + -- Michael Prokop <mika@grml.org>  Fri, 27 Jul 2012 15:06:38 +0200
 +
 +live-boot (3.0~a27-1+grml.4) grml-testing; urgency=low
 +
 +  * [6d32dfe] Check for presence of /tmp/net-${device}.conf before
 +    sourcing it [Closes: issue1196] Thanks to Marc 'Zugschlus' Haber for
 +    the bugreport and debugging this issue
 +
 + -- Michael Prokop <mika@grml.org>  Mon, 23 Jul 2012 17:13:42 +0200
 +
 +live-boot (3.0~a27-1+grml.3) grml-testing; urgency=low
 +
 +  * [d978027] 35_fix_findiso_umount.patch: make sure ISO gets unmounted
 +    correctly when using findiso/toram. Thanks to Christoph Biedl for the
 +    bugreport and the patch
 +  * [d621ee2] 34_ignore_unknown_filesystems.patch: also ignore fstype swap
 +
 + -- Michael Prokop <mika@grml.org>  Mon, 28 May 2012 12:27:08 +0200
 +
 +live-boot (3.0~a27-1+grml.2) grml-testing; urgency=low
 +
 +  * [e161c2c] New patch to ignore "unknown" filesystems in
 +    is_supported_fs() [Testing: issue1170]
 +
 + -- Michael Prokop <mika@grml.org>  Sun, 20 May 2012 18:54:58 +0200
 +
 +live-boot (3.0~a27-1+grml.1) grml-testing; urgency=low
 +
 +  * [3039c63] Sync with Debian's upstream/3.0_a27 (new log file name,
 +    persistency reworked,...)
 +  * [06185b3] Bump Standards-Version, raise Build-Depends from dh 8 to dh
 +    9 + raise compat version to 9
 +  * [2998c28] Drop debian/patches/07_support_findiso.patch which is in
 +    upstream nowadays
 +  * [3967979] Drop deprecated debian/patches/14_no_blkid_on_lenny.patch
 +  * [91460b9] Refresh debian/patches/ against new upstream code
 +  * [7116647] Drop deprecated debian/patches/28_remove_localized_manpages.patch
 +
 + -- Michael Prokop <mika@grml.org>  Wed, 09 May 2012 14:10:37 +0200
 +
  live-boot (3.0~a27-1) experimental; urgency=low
  
    [ Daniel Baumann ]
@@@ -1391,39 -1106,6 +1408,39 @@@ live-boot (3.0~a25-1) unstable; urgency
  
   -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 06 Feb 2012 23:27:38 +0100
  
 +live-boot (3.0~a24-1+grml.2) grml-testing; urgency=low
 +
 +  [ Ulrich Dangel ]
 +  * [87a8e76] Append nameservers provided via dns bootoption into
 +    initramfs resolv.conf
 +
 +  [ Michael Prokop ]
 +  * [1d25495] Add genext2fs to depends [Closes: issue1126] Thanks to
 +    Charles A. Hewson for the bugreport
 +
 + -- Michael Prokop <mika@grml.org>  Wed, 04 Jan 2012 16:48:38 +0100
 +
 +live-boot (3.0~a24-1+grml.1) grml-testing; urgency=low
 +
 +  * Resynchronized with Debian.
 +
 +  [ Christian Hofstaedtler ]
 +  * Resynchronized with Debian.
 +  * Drop upstream-applied patch: 01_fix_output_file
 +  * Drop upstream-applied patch: 10_validateroot
 +  * Drop upstream-applied patch: 25_support_lvm_for_live-media
 +  * 07_support_findiso: remove upstream-applied parts
 +  * Manually refreshd patch 31_package_rename
 +
 +  [ Ulrich Dangel ]
 +  * Add kms modules to initramfs
 +  * Install hook instead of specifying modules.d
 +
 +  [ Michael Prokop ]
 +  * Try loading phram module twice to fix loading issue.
 +
 + -- Christian Hofstaedtler <ch@grml.org>  Tue, 06 Dec 2011 22:26:32 +0100
 +
  live-boot (3.0~a24-1) unstable; urgency=low
  
    * Removing quotes from udev path_id command to actually execute the
@@@ -1530,38 -1212,6 +1547,38 @@@ live-boot (3.0~a20-1) unstable; urgency
  
   -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 04 Aug 2011 21:20:47 +0200
  
 +live-boot (3.0~a19-1+grml.01) grml-testing; urgency=low
 +
 +  * Depend on quilt with a version to quiet lintian
 +  * Add debian/control headers Origin, Bugs
 +
 + -- Christian Hofstaedtler <ch@grml.org>  Wed, 30 Nov 2011 13:24:41 +0100
 +
 +live-boot (3.0~a19-1+grml.00) unstable; urgency=low
 +
 +  * Resync with Debian. This brings in:
 +    [ Daniel Baumann ]
 +    * Updating and correcting sendsigs.omit support for /run (Closes: #628188).
 +    * Removing accidentally twice included English files when installing manpages.
 +    * Correct rmdir call in top-level Makefiles uninstall target to not fail if there was no prior live-boot installation.
 +    * Making references to debian more distribution neutral.
 +    * Replacing reference to old alioth page in live-snapshot.
 +    * Splitting out documentation so that it can be accesses separately from the initramfs code.
 +    * Adding conflicts/replaces for live-boot to live-boot-doc to not break upgrades.
 +
 +  * Grml changes:
 +    [ Ulrich Dangel ]
 +    * [8424e93] Use quilt instead of dpatch
 +    * [86ca4d5] Remove old manpage live-snapshot.it.1.txt
 +    * [7fb9e91] Support comma delimited devices in live-media-path
 +    * [6b21c57] Depend on the same live-boot-initramfs-tools/live-boot-backend version.
 +  
 +    [ Christian Hofstaedtler ]
 +    * Rename packages to not clash with Debian.
 +    * Resynced with Debian.
 +
 + -- Christian Hofstaedtler <ch@grml.org>  Mon, 25 Jul 2011 02:26:40 +0200
 +
  live-boot (3.0~a19-1) unstable; urgency=low
  
    * Correct rmdir call in top-level Makefiles uninstall target to not
@@@ -1584,51 -1234,6 +1601,51 @@@ live-boot (3.0~a18-1) unstable; urgency
  
   -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 11 Jun 2011 11:24:15 +0200
  
 +live-boot (3.0~a17-1+grml.01) unstable; urgency=low
 +
 +  * [6666658] Do not fail in multiarch environment when
 +    installing libnss_dns.so.
 +  * [ebdefd9] Drop installation of localized manpages
 +    from upstream Makefile.
 +
 + -- Michael Prokop <mika@grml.org>  Wed, 08 Jun 2011 12:15:23 +0200
 +
 +live-boot (3.0~a17-1+grml.00) unstable; urgency=low
 +
 +  [ Christian Hofstaedtler ]
 +  * [c9a70fd] Add dpatch support to build process.
 +  * [a9ddc0a] Readd Grml patches.
 +  * [675f2b2] Remove unused boot scripts.
 +  * [c4993d4] Update debian/control for Grml.
 +  * [0716b66] Ensure 10validateroot is executable.
 +  * [b5b937f] Always honor the "nodhcp" boot option.
 +  * [10cf847] Don't mess around with kernel/initramfs-tools' ip=.
 +  * [aa93321] Networking_grml: DNS for systems without resolvconf.
 +  * [2a859b8] Merge dhcphostname support into 23networking-grml.
 +  * [10caf0b] Support DNS in boot environment.
 +
 +  [ Michael Prokop ]
 +  * [6cd3977] Add patch number 19 to revert the toram bootoption
 +    to expected behaviour.
 +  * [65fa11b] Support dns bootoption.
 +
 +  [ Ulrich Dangel ]
 +  * [df17b43] Support lvm devices for live-media.
 +  * [8ff045c] Support raid devices as well.
 +  * [2ad3c30] Change output to live-boot.log.
 +  * [34b4518] Explicit specify offset parameter for setup_loop.
 +    [Closes: issue1003]
 +  * [3ac64e5] Remove dba from uploader as this is a Grml project.
 +  * [b289379] Support static ip configuration.
 +  * [1371673] Improve static version.
 +  * [9487c5d] Change nodhcp patch to unset the DHCP option as well.
 +  * [1662374] Support nodhcp bootoption.
 +  * [7847abd] Ignore devices with no file matching the findiso parameter.
 +  * [7158e84] Don't show an error message if /live/image is already
 +    unmounted.
 +
 + -- Michael Prokop <mika@grml.org>  Sun, 05 Jun 2011 21:29:14 +0200
 +
  live-boot (3.0~a17-1) unstable; urgency=low
  
    [ Daniel Baumann ]

diff --combined debian/live-boot-grml-initramfs-tools.postinst
index d11c8d9,7239bfd..7239bfd
--- 1/debian/live-boot-grml-initramfs-tools.postinst
--- 2/debian/live-boot-initramfs-tools.postinst
+++ b/debian/live-boot-grml-initramfs-tools.postinst
@@@ -4,7 -4,7 +4,7 @@@ set -
  
  case "${1}" in
        configure)
-               if [ -x /usr/sbin/update-initramfs ] && [ -e /etc/initramfs-tools/initramfs.conf ]
+               if which update-initramfs >/dev/null 2>&1 && [ -e /etc/initramfs-tools/initramfs.conf ]
                then
                        update-initramfs -u
                fi