Merge remote-tracking branch 'upstream/master'

diff --combined Makefile
index 7be7e68,d1ecb72..c64c8c3
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -32,13 -32,13 +32,13 @@@ test
        else \
                echo "W: checkbashisms - command not found"; \
                echo "I: checkbashisms can be obtained from: "; \
-               echo "I:   http://git.debian.org/?p=devscripts/devscripts.git"; \
+               echo "I:   https://salsa.debian.org/debian/devscripts.git"; \
                echo "I: On Debian based systems, checkbashisms can be installed with:"; \
                echo "I:   apt-get install devscripts"; \
        fi
  
  build:
-       @echo "Nothing to build."
+       $(MAKE) -C $(CURDIR)/manpages
  
  install:
        # Installing components
@@@ -59,8 -59,8 +59,8 @@@
        cp frontend/* $(DESTDIR)/bin
  
        # Installing docs
 -      mkdir -p $(DESTDIR)/usr/share/doc/live-boot
 -      cp -r COPYING $(DESTDIR)/usr/share/doc/live-boot
 +      mkdir -p $(DESTDIR)/usr/share/doc/live-boot-grml
 +      cp -r COPYING $(DESTDIR)/usr/share/doc/live-boot-grml
  
        # Installing manpages
        for MANPAGE in manpages/en/*; \
@@@ -94,7 -94,7 +94,7 @@@ uninstall
        rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true
  
        # Uninstalling docs
 -      rm -rf $(DESTDIR)/usr/share/doc/live-boot
 +      rm -rf $(DESTDIR)/usr/share/doc/live-boot-grml
        rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc > /dev/null 2>&1 || true
        rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share > /dev/null 2>&1 || true
        rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true

diff --combined backend/initramfs-tools/live.hook
index ff5fa70,b37f54f..1efa687
--- 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
@@@ -242,11 -236,11 +242,11 @@@ f
  
  [ "${QUIET}" ] || echo -n " dns"
  
- # /lib/libnss_dns.so.*:a   DNS
- # /lib/libnss_files.so.*:  /etc/hosts and /etc/passwd
- # /lib/libnss_compat.so.*: /etc/passwd
+ # libnss_dns.so.*:    DNS
+ # libnss_files.so.*:  /etc/hosts and /etc/passwd
+ # libnss_compat.so.*: /etc/passwd
  
- for _SHLIB in $(find /lib/ -name 'libnss_dns.so.*' -o -name 'libnss_files.so.*')
+ for _SHLIB in $(find /lib /usr/lib -name 'libnss_dns.so.*' -o -name 'libnss_files.so.*')
  do
        copy_exec "${_SHLIB}"
  done
@@@ -257,11 -251,4 +257,11 @@@ the
        echo "hosts: files dns" > "${DESTDIR}/etc/nsswitch.conf"
  fi
  
 +# vlan support
 +if [ -x /sbin/vconfig ]
 +then
 +      copy_exec /sbin/vconfig
 +      manual_add_modules 8021q
 +fi
 +
  [ "${QUIET}" ] || echo .

diff --combined components/9990-cmdline-old
index 6ac6eb5,6e9082d..1504e1e
--- 1/components/9990-cmdline-old
--- 2/components/9990-cmdline-old
+++ b/components/9990-cmdline-old
@@@ -23,12 -23,6 +23,12 @@@ Cmdline_old (
                                export DNSSERVERS
                                unset DNS
                                ;;
 +
 +                      bootid=*)
 +                              BOOTID="${_PARAMETER#bootid=}"
 +                              export BOOTID
 +                              ;;
 +
                        dhcp)
                                # Force dhcp even while netbooting
                                # Use for debugging in case somebody works on fixing dhclient
@@@ -92,11 -86,6 +92,11 @@@
                                export FROMISO
                                ;;
  
 +                      ignore_bootid)
 +                              IGNORE_BOOTID="Yes"
 +                              export IGNORE_BOOTID
 +                              ;;
 +
                        ignore_uuid)
                                IGNORE_UUID="true"
                                export IGNORE_UUID
@@@ -158,11 -147,6 +158,11 @@@
                                export NFS_COW
                                ;;
  
 +                      nodhcphostname)
 +                              NODHCPHOSTNAME="Yes"
 +                              export NODHCPHOSTNAME
 +                              ;;
 +
                        nofstab)
                                NOFSTAB="true"
                                export NOFSTAB
@@@ -216,7 -200,7 +216,7 @@@
                                ;;
  
                        persistence-label=*)
-                               custom_overlay_label="${_PARAMETER#persistence-label=*}"
+                               custom_overlay_label=$(echo ${_PARAMETER#persistence-label=*} | sed -e 's/,/ /g')
                                ;;
  
                        nopersistence)
@@@ -269,11 -253,6 +269,11 @@@
                                UNIONTYPE="${_PARAMETER#union=}"
                                export UNIONTYPE
                                ;;
 +
 +                      vlan=*)
 +                              VLANS="${VLANS} ${_PARAMETER#vlan=}"
 +                              export VLANS
 +                              ;;
                esac
        done
  

diff --combined components/9990-main.sh
index b9bd71b,b50952f..b0e2a7b
--- 1/components/9990-main.sh
--- 2/components/9990-main.sh
+++ b/components/9990-main.sh
@@@ -33,11 -33,11 +33,11 @@@ Live (
        # Needed here too because some things (*cough* udev *cough*)
        # changes the timeout
  
-       if [ ! -z "${NETBOOT}" ] || [ ! -z "${FETCH}" ] || [ ! -z "${HTTPFS}" ] || [ ! -z "${FTPFS}" ]
+       if [ -n "${NETBOOT}" ] || [ -n "${FETCH}" ] || [ -n "${HTTPFS}" ] || [ -n "${FTPFS}" ]
        then
                if do_netmount
                then
-                       livefs_root="${mountpoint}"
+                       livefs_root="${mountpoint?}"
                else
                        panic "Unable to find a live file system on the network"
                fi
@@@ -52,13 -52,22 +52,22 @@@
                else
                        if [ -x /usr/bin/memdiskfind ]
                        then
-                               MEMDISK=$(/usr/bin/memdiskfind)
- 
-                               if [ $? -eq 0 ]
+                               if MEMDISK=$(/usr/bin/memdiskfind)
                                then
                                        # We found a memdisk, set up phram
-                                       modprobe phram phram=memdisk,${MEMDISK}
-                                       modprobe phram phram=memdisk,${MEMDISK}
+                                       # Sometimes "modprobe phram" can not successfully create /dev/mtd0.
+                                       # Have to try several times.
+                                       max_try=20
+                                       while [ ! -c /dev/mtd0 ] && [ "$max_try" -gt 0 ]; do
+                                         modprobe phram "phram=memdisk,${MEMDISK}"
+                                         sleep 0.2
+                                         if [ -c /dev/mtd0 ]; then
+                                               break
+                                         else
+                                               rmmod phram
+                                         fi
+                                         max_try=$((max_try - 1))
+                                       done
  
                                        # Load mtdblock, the memdisk will be /dev/mtdblock0
                                        modprobe mtdblock
@@@ -77,7 -86,7 +86,7 @@@
                                fi
  
                                sleep 1
-                               i="$(($i + 1))"
+                               i=$((i + 1))
                        done
                fi
        fi
@@@ -121,10 -130,10 +130,10 @@@
  
        if [ -n "${MODULETORAMFILE}" ] || [ -n "${PLAIN_ROOT}" ]
        then
-               setup_unionfs "${livefs_root}" "${rootmnt}"
+               setup_unionfs "${livefs_root}" "${rootmnt?}"
        else
                mac="$(get_mac)"
-               mac="$(echo ${mac} | sed 's/-//g')"
+               mac="$(echo "${mac}" | sed 's/-//g')"
                mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}"
        fi
  
@@@ -156,16 -165,30 +165,30 @@@
                fi
        fi
  
+       if [ -f /etc/hostname ] && ! grep -E -q -v '^[[:space:]]*(#|$)' "${rootmnt}/etc/hostname"
+       then
+               log_begin_msg "Copying /etc/hostname to ${rootmnt}/etc/hostname"
+               cp -v /etc/hostname "${rootmnt}/etc/hostname"
+               log_end_msg
+       fi
+ 
+       if [ -f /etc/hosts ] && ! grep -E -q -v '^[[:space:]]*(#|$|(127.0.0.1|::1|ff02::[12])[[:space:]])' "${rootmnt}/etc/hosts"
+       then
+               log_begin_msg "Copying /etc/hosts to ${rootmnt}/etc/hosts"
+               cp -v /etc/hosts "${rootmnt}/etc/hosts"
+               log_end_msg
+       fi
+ 
        if [ -L /root/etc/resolv.conf ] ; then
                # assume we have resolvconf
                DNSFILE="${rootmnt}/etc/resolvconf/resolv.conf.d/base"
        else
                DNSFILE="${rootmnt}/etc/resolv.conf"
        fi
-       if [ -f /etc/resolv.conf ] && ! grep -E -q -v '^[[:space:]]*#|^[[:space:]]*$' ${DNSFILE}
+       if [ -f /etc/resolv.conf ] && ! grep -E -q -v '^[[:space:]]*(#|$)' "${DNSFILE}"
        then
                log_begin_msg "Copying /etc/resolv.conf to ${DNSFILE}"
-               cp -v /etc/resolv.conf ${DNSFILE}
+               cp -v /etc/resolv.conf "${DNSFILE}"
                log_end_msg
        fi
  
@@@ -178,19 -201,14 +201,19 @@@
        # this includes code that checks what is mounted on /lib/live/mount/*
        # (eg: grep /lib/live /proc/mount)
        # XXX: to be removed before the bullseye release
-       mkdir -p ${rootmnt}/lib/live/mount
-       mount --rbind /run/live ${rootmnt}/lib/live/mount
+       mkdir -p "${rootmnt}/lib/live/mount"
+       mount --rbind /run/live "${rootmnt}/lib/live/mount"
  
        Fstab
 -      Netbase
  
        Swap
  
 +      if grep -q debian_networking /proc/cmdline ; then
 +              Netbase
 +      else
 +              Grml_Networking
 +      fi
 +
        exec 1>&6 6>&-
        exec 2>&7 7>&-
        kill ${tailpid}

diff --combined components/9990-misc-helpers.sh
index ef3688e,7994ecd..c7a82fb
--- 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 ]
@@@ -295,7 -259,7 +295,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
@@@ -391,6 -355,19 +391,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
  
@@@ -495,6 -472,14 +495,14 @@@ is_supported_fs (
        fi
  
        # Try to look if it is already supported by the kernel
+       # For ntfs, since user space program ntfs-3g will be used. Check ntfs-3g instead of kernel module.
+       if [ "${fstype}" = "ntfs" ]; then
+               if type ntfs-3g >/dev/null 2>&1; then
+                       return 0
+               else
+                       return 1
+               fi
+       fi
        if grep -q ${fstype} /proc/filesystems
        then
                return 0
@@@ -795,7 -780,7 +803,7 @@@ mount_persistence_media (
                then
                        mount_opts="ro,noatime"
                fi
-               if mount -t "${fstype}" -o "${mount_opts}" "${device}" "${backing}" >/dev/null
+               if mount -t "${fstype}" -o "${mount_opts}" "${device}" "${backing}" >/dev/null 2>&1
                then
                        echo ${backing}
                        return 0
@@@ -1398,8 -1383,8 +1406,8 @@@ do_union (
                        # + a workdir to become mounted
                        # + workdir and upperdir to reside under the same mount
                        # + workdir and upperdir to be in separate directories
-                       mkdir "${unionrw}/rw"
-                       mkdir "${unionrw}/work"
+                       mkdir -p "${unionrw}/rw"
+                       mkdir -p "${unionrw}/work"
                        unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work"
                        ;;
        esac

diff --combined debian/changelog
index 7055ec1,d3020bf..8f9b668
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,25 +1,57 @@@
+ live-boot (1:20190614) unstable; urgency=medium
+ 
+   [ Roland Clobus ]
+   * The homepage is https://wiki.debian.org/DebianLive
+   * Used the same text for po4a as in live-manual.
+   * Updated URL to the homepage and manual.
+   * Fixed Lintian warning: manpage-section-mismatch
+   * Always rebuild po4a.cfg This is needed to ensure that new languages
+     will automatically be found
+   * New Build-Depends: po4a for the translation files
+   * Updated the translation files. The translators can now update their
+     translations.
+ 
+   [ Benjamin Drung ]
+   * Also search for libnss_*.so files in /usr/lib (Closes: #930419)
+ 
+   [ Luca Boccassi ]
+   * Set Rules-Requires-Root: no
+   * Set Standards-Version to 4.3.0
+ 
+  -- Luca Boccassi <bluca@debian.org>  Fri, 14 Jun 2019 10:55:07 +0100
+ 
 +live-boot (1:20180603+grml.3) unstable; urgency=medium
 +
 +  * [d189b07] Ensure locating libnss* files doesn't fail on merged-usr
 +    systems
 +
 + -- Michael Prokop <mika@grml.org>  Thu, 11 Jul 2019 11:51:40 +0200
 +
 +live-boot (1:20180603+grml.2) unstable; urgency=medium
 +
 +  * [ad4ec75] Do not generate dhcp entry for loopback interface.
 +    Thanks to Mykola Malkov for the bug report
 +
 + -- Michael Prokop <mika@grml.org>  Fri, 08 Feb 2019 17:26:00 +0100
 +
 +live-boot (1:20180603+grml.1) unstable; urgency=medium
 +
 +  * [f35e0cf] Sync with Debian's upstream
 +    (https://salsa.debian.org/live-team/live-boot/),
 +    git commit 7130a2c0b.
 +  * [c8a5e53] Minimize delta to Debian's upstream/master
 +  * [27bc786] Support debian_networking boot option to use Debian's
 +    network behavior
 +  * [52474b4] 9990-grml-networking.sh:
 +    * By displaying "Preconfiguring Grml networking" it's more
 +      explicit that we're running the 9990-grml-networking.sh code
 +    * It's not the 23networking live-initramfs hook since quite some time,
 +      update the comment for generation of /etc/network/interfaces
 +    * Support also new style network device names by iterating over
 +      /sys/class/net/* and skipping only the loopback interface
 +
 + -- Michael Prokop <mika@grml.org>  Fri, 14 Dec 2018 15:40:36 +0100
 +
  live-boot (1:20180603) unstable; urgency=medium
  
    [ Luca Boccassi ]
@@@ -122,77 -112,22 +144,77 @@@ live-boot (1:20170623) unstable; urgenc
  
   -- Raphaël Hertzog <hertzog@debian.org>  Fri, 23 Jun 2017 14:41:06 +0200
  
 -live-boot (1:20170112) unstable; urgency=medium
 +live-boot (1:20170112+grml.1) unstable; urgency=medium
 +
 +  [ Kristian Klausen ]
 +  * [d73c5d5] Check /etc/live/boot.conf exist before trying copy
 +  * [c409a25] Add FAT ascii iocharset support via adding the
 +    "nls_ascii" module to the initrd (Closes: #850532)
  
    [ 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.
 +  * [7d04ce6] Fix typo in nls_ascii module (nls_asci -> nls_ascii)
 +  * [061976c] Add missing changelog entries
 +  * [2690692] Improve removable_dev() in 9990-misc-helpers.sh when
 +    /sys/block/ is empty (Closes: #847802)
 +  * [d78be8a] Multiple cleanups to appease lintian.
 +  * [4ccc833] Prepare release to unstable
 +  * [aac9014] Only copy /etc/live/boot if it exists
 +
 +  [ Evgeni Golov ]
 +  * [b88a8da] fix nodhcp option to actually force DHCP off. Thanks to
 +    Frank Lillo <frank.lillo@gecoinc.com> (Closes: #785345)
 +
 + -- Michael Prokop <mika@grml.org>  Sun, 26 Mar 2017 10:19:17 +0200
 +
 +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 ]
 -  * 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.
 +  * [b98d289] Copy /etc/live/boot{,.conf} to initramfs
  
 - -- Raphaël Hertzog <hertzog@debian.org>  Thu, 12 Jan 2017 16:59:49 +0100
 + -- Michael Prokop <mika@grml.org>  Tue, 05 Jul 2016 19:36:14 +0200
  
  live-boot (1:20160511) unstable; urgency=medium
  
@@@ -208,22 -143,6 +230,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 ]
@@@ -262,27 -181,6 +284,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 ]
@@@ -364,26 -262,6 +386,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 ]
@@@ -401,12 -279,6 +423,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 ]
@@@ -420,12 -292,6 +442,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.
@@@ -444,32 -310,6 +466,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.
@@@ -589,49 -429,6 +611,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
@@@ -824,13 -621,6 +846,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 ]
@@@ -888,16 -678,6 +910,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 ]
@@@ -923,23 -703,6 +945,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 ]
@@@ -950,16 -713,6 +972,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
@@@ -1294,76 -1047,6 +1316,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 ]
@@@ -1537,39 -1220,6 +1559,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
@@@ -1676,38 -1326,6 +1698,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
@@@ -1730,51 -1348,6 +1752,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/control
index 6a54689,65c6b83..e20fe5e
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,23 -1,25 +1,27 @@@
  Source: live-boot
  Section: misc
  Priority: optional
 -Maintainer: Debian Live Maintainers <debian-live@lists.debian.org>
 -Uploaders: Iain R. Learmonth <irl@debian.org>, Raphaël Hertzog <hertzog@debian.org>,
 - Luca Boccassi <bluca@debian.org>
 +Maintainer: Grml Team <team@grml.org>
++Uploaders: Michael Prokop <mika@grml.org>
  Build-Depends:
-  debhelper (>= 10),
- Standards-Version: 4.1.3
+  debhelper-compat (= 12),
+  po4a,
+ Standards-Version: 4.4.1
+ Rules-Requires-Root: no
+ Homepage: https://wiki.debian.org/DebianLive
 -Vcs-Browser: https://salsa.debian.org/live-team/live-boot
 -Vcs-Git: https://salsa.debian.org/live-team/live-boot.git
 +Homepage: http://live.debian.net/devel/live-boot/
- Vcs-Browser: http://git.grml.org/?p=live-boot-grml.git
++Vcs-Browser: https://git.grml.org/?p=live-boot-grml.git
 +Vcs-Git: git://git.grml.org/live-boot-grml.git
 +Origin: Grml
 +Bugs: mailto:bugs@grml.org
  
 -Package: live-boot
 +Package: live-boot-grml
  Architecture: all
  Depends:
 - live-boot-initramfs-tools | live-boot-backend,
 + live-boot-grml-initramfs-tools | live-boot-backend,
   ${misc:Depends},
  Recommends:
 - live-boot-doc,
 + live-boot-grml-doc,
   live-tools,
   rsync,
   uuid-runtime,
@@@ -26,41 -28,33 +30,41 @@@ Suggests
   curlftpfs,
   httpfs2,
   wget,
 +Conflicts: live-boot
 +Replaces: live-boot
 +Provides: live-boot
  Description: Live System Boot Components
 - The Debian Live project maintains the components to build Debian based Live
 - systems and the official Debian Live images themselves.
 - .
   live-boot contains the components to configure a live system during the boot
   process (early userspace). Do not install this package on your regular system,
   it is only meant to be used in a live image.
   .
   In addition to live-boot, a backend for the initrd generation is required, such
   as live-boot-initramfs-tools.
 + .
 + Please notice that this package is maintained by the grml.org team.
 + This is NOT a fork of Debian's live-boot, it's just a customized
 + version to better fit Grml's needs.
  
 -Package: live-boot-doc
 +Package: live-boot-grml-doc
  Section: doc
  Architecture: all
  Multi-Arch: foreign
  Depends:
   ${misc:Depends},
  Description: Live System Boot Components (documentation)
-  The Live Systems project maintains the components to build Debian based Live
+  The Debian Live project maintains the components to build Debian based Live
   systems and the official Debian Live images themselves.
   .
   live-boot contains the components to configure a live system during the boot
   process (early userspace).
   .
   This package contains the documentation.
 + .
 + Please notice that this package is maintained by the grml.org team.
 + This is NOT a fork of Debian's live-boot, it's just a customized
 + version to better fit Grml's needs.
  
 -Package: live-boot-initramfs-tools
 +Package: live-boot-grml-initramfs-tools
  Architecture: all
  Depends:
   busybox | busybox-initramfs,
@@@ -74,7 -68,7 +78,7 @@@ Replaces
  Provides:
   live-boot-backend,
  Description: Live System Boot Components (initramfs-tools backend)
-  The Live Systems project maintains the components to build Debian based Live
+  The Debian Live project maintains the components to build Debian based Live
   systems and the official Debian Live images themselves.
   .
   live-boot contains the components to configure a live system during the boot
@@@ -82,7 -76,3 +86,7 @@@
   it is only meant to be used in a live image.
   .
   This package contains the initramfs-tools backend.
 + .
 + Please notice that this package is maintained by the grml.org team.
 + This is NOT a fork of Debian's live-boot, it's just a customized
 + version to better fit Grml's needs.

diff --combined debian/live-boot-grml.bug-presubj
index d0690ee,b870142..b870142
--- 1/debian/live-boot-grml.bug-presubj
--- 2/debian/live-boot.bug-presubj
+++ b/debian/live-boot-grml.bug-presubj
@@@ -1,7 -1,7 +1,7 @@@
  Before submitting a bug report against live-boot, please make sure
  that you have read our guidelines for live systems bug reports:
  
-   http://live-systems.org/manual/
+   https://live-team.pages.debian.net/live-manual/html/live-manual/bugs.en.html
  
  By providing the required information as outlined in the guidelines makes
  sure that we can optimally reproduce and fix bugs, not doing so wastes a

diff --combined debian/rules
index a5df4d6,96182a3..e19aca4
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -7,11 -7,11 +7,11 @@@ override_dh_auto_install
        dh_auto_install -- DESTDIR=debian/tmp
  
        # Removing useless files
 -      rm -f debian/tmp/usr/share/doc/live-boot/COPYING
 +      rm -f debian/tmp/usr/share/doc/live-boot-grml/COPYING
  
        # live-boot-initramfs-tools
 -      mkdir -p debian/live-boot-initramfs-tools/usr/share
 -      mv debian/tmp/usr/share/initramfs-tools debian/live-boot-initramfs-tools/usr/share
 +      mkdir -p debian/live-boot-grml-initramfs-tools/usr/share
 +      mv debian/tmp/usr/share/initramfs-tools debian/live-boot-grml-initramfs-tools/usr/share
  
- override_dh_install:
-       dh_install --fail-missing
+ override_dh_missing:
+       dh_missing --fail-missing