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 --cc backend/initramfs-tools/live.hook
Simple merge

diff --cc components/9990-misc-helpers.sh
Simple merge

diff --cc components/9990-netbase.sh
index df8d080,04a4ae4..c463cc0
--- 1/components/9990-netbase.sh
--- 2/components/9990-netbase.sh
+++ b/components/9990-netbase.sh
@@@ -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 --cc 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.

diff --cc debian/live-boot-grml-initramfs-tools.postinst
Simple merge