Merge remote-tracking branch 'upstream/master'
authorMichael Prokop <mika@grml.org>
Thu, 13 Dec 2018 14:58:31 +0000 (15:58 +0100)
committerMichael Prokop <mika@grml.org>
Thu, 13 Dec 2018 14:58:31 +0000 (15:58 +0100)
Sync with upstream (https://salsa.debian.org/live-team/live-boot/),
git commit 7130a2c0b.

1  2 
backend/initramfs-tools/live.hook
components/9990-cmdline-old
components/9990-main.sh
components/9990-misc-helpers.sh
components/9990-netbase.sh
debian/changelog
debian/control
debian/rules

@@@ -8,7 -8,7 +8,7 @@@ set -
  
  # Reading configuration file from filesystem and live-media
  for _FILE in /etc/live/boot.conf /etc/live/boot/* \
-            /lib/live/mount/media/live/boot.conf /lib/live/mount/media/live/boot/*
+            /run/live/medium/live/boot.conf /run/live/medium/live/boot/*
  do
        if [ -e "${_FILE}" ]
        then
        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
@@@ -34,7 -28,7 +34,7 @@@ f
  [ "${QUIET}" ] || echo -n " core"
  
  mkdir -p "${DESTDIR}/bin"
- cp -a /bin/live-boot /lib/live/boot "${DESTDIR}/bin"
+ cp -a /bin/live-boot "${DESTDIR}/bin"
  
  mkdir -p "${DESTDIR}/lib/live"
  cp -a /lib/live/boot "${DESTDIR}/lib/live"
@@@ -59,12 -53,16 +59,16 @@@ d
  done
  
  # udev dependencies
- for FILE in /lib/udev/*_id
- do
-       copy_exec "${FILE}"
- done
+ if [ "${MINIMAL:-}" != "true" ] &&  [ "${MINIMAL:-}" != "yes" ]
+ then
+       for FILE in /lib/udev/*_id
+       do
+               copy_exec "${FILE}"
+       done
+ fi
  
- if [ -e /lib/udev/rules.d/60-cdrom_id.rules ]
+ if [ -e /lib/udev/rules.d/60-cdrom_id.rules ] && [ "${DISABLE_CDROM:-}" != "true" ] && \
+       [ "${DISABLE_CDROM:-}" != "yes" ]
  then
        mkdir -p "${DESTDIR}/lib/udev/rules.d"
        cp -p /lib/udev/rules.d/60-cdrom_id.rules "${DESTDIR}/lib/udev/rules.d"
@@@ -109,7 -107,7 +113,7 @@@ manual_add_modules hfsplu
  # Filesystem: jffs2
  manual_add_modules jffs2
  
- if [ -x /usr/bin/rsync ]
+ if [ -x /usr/bin/rsync ] && [ "${MINIMAL:-}" != "true" ] && [ "${MINIMAL:-}" != "yes" ]
  then
        copy_exec /usr/bin/rsync /bin
  fi
@@@ -126,25 -124,37 +130,37 @@@ manual_add_modules auf
  manual_add_modules overlay
  
  # Filesystem: vfat
- 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
+ if [ "${DISABLE_FAT:-}" != "true" ] &&  [ "${DISABLE_FAT:-}" != "yes" ]
+ then
+       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
+ fi
  
  # Filesystem: ntfs
- manual_add_modules ntfs
+ if [ "${DISABLE_NTFS:-}" != "true" ] && [ "${DISABLE_NTFS:-}" != "yes" ]
+ then
+       manual_add_modules ntfs
+ fi
  
  [ "${QUIET}" ] || echo -n " devices"
  # Hardware: cdrom
- manual_add_modules ide-cd
- manual_add_modules ide-generic
- manual_add_modules ohci1394
- manual_add_modules sbp2
- manual_add_modules sr_mod
+ if [ "${DISABLE_CDROM:-}" != "true" ] && [ "${DISABLE_CDROM:-}" != "yes" ]
+ then
+       manual_add_modules ide-cd
+       manual_add_modules ide-generic
+       manual_add_modules ohci1394
+       manual_add_modules sbp2
+       manual_add_modules sr_mod
+ fi
  
  # Hardware: usb
- manual_add_modules sd_mod
+ if [ "${DISABLE_USB:-}" != "true" ] && [ "${DISABLE_USB:-}" != "yes" ]
+ then
+       manual_add_modules sd_mod
+ fi
  
  # Hardware: network
  auto_add_modules net
@@@ -155,10 -165,6 +171,6 @@@ the
        copy_exec /usr/bin/eject /bin
  fi
  
- # Program: mount
- # fuse does not work with klibc mount
- copy_exec /bin/mount /bin/mount.util-linux
  [ "${QUIET}" ] || echo -n " utils"
  
  # Feature: Verify Checksums
@@@ -179,17 -185,10 +191,10 @@@ the
  fi
  
  # Program: udev
- if [ -x /sbin/udevadm ]
+ if [ -x /bin/udevadm ]
  then
        [ "${QUIET}" ] || echo -n " udev"
-       copy_exec /sbin/udevadm
- fi
- # Program: wget
- if [ -x /usr/bin/wget ]
- then
-       [ "${QUIET}" ] || echo -n " wget"
-       copy_exec /usr/bin/wget /bin
+       copy_exec /bin/udevadm
  fi
  
  # Program: blockdev
@@@ -200,24 -199,27 +205,27 @@@ the
  fi
  
  # FUSE kernel module
- manual_add_modules fuse
- # FUSE filesystem: httpfs2
- if [ -x /usr/bin/httpfs2_ssl ]
- then
-       [ "${QUIET}" ] || echo -n " httpfs:ssl"
-       copy_exec /usr/bin/httpfs2_ssl /bin/httpfs
- elif [ -x /usr/bin/httpfs2 ]
+ if [ "${DISABLE_FUSE:-n}" != "true" ] && [ "${DISABLE_FUSE:-n}" != "yes" ]
  then
-       [ "${QUIET}" ] || echo -n " httpfs"
-       copy_exec /usr/bin/httpfs2 /bin/httpfs
- fi
+       manual_add_modules fuse
  
- # FUSE filesystem: curlftpfs
- if [ -x /usr/bin/curlftpfs ]
- then
-       [ "${QUIET}" ] || echo -n " ftpfs"
-       copy_exec /usr/bin/curlftpfs /bin
+       # FUSE filesystem: httpfs2
+       if [ -x /usr/bin/httpfs2_ssl ]
+       then
+               [ "${QUIET}" ] || echo -n " httpfs:ssl"
+               copy_exec /usr/bin/httpfs2_ssl /bin/httpfs
+       elif [ -x /usr/bin/httpfs2 ]
+       then
+               [ "${QUIET}" ] || echo -n " httpfs"
+               copy_exec /usr/bin/httpfs2 /bin/httpfs
+       fi
+       # FUSE filesystem: curlftpfs
+       if [ -x /usr/bin/curlftpfs ]
+       then
+               [ "${QUIET}" ] || echo -n " ftpfs"
+               copy_exec /usr/bin/curlftpfs /bin
+       fi
  fi
  
  # iSCSI
  # /lib/libnss_files.so.*:  /etc/hosts and /etc/passwd
  # /lib/libnss_compat.so.*: /etc/passwd
  
- for _SHLIB in $(find /lib -name 'libnss_dns.so.*')
+ for _SHLIB in $(find /lib -name 'libnss_dns.so.*' -o -name 'libnss_files.so.*')
  do
        copy_exec "${_SHLIB}"
  done
  
- # might be needed if /etc/hosts is used
- #mkdir -p "${DESTDIR}/etc"
- #cp -p /etc/nsswitch.conf "${DESTDIR}/etc"
+ if [ ! -e "${DESTDIR}/etc/nsswitch.conf" ]
+ then
+       # Needed to make "hostname -f" honor the domainname provided by DHCP
+       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 .
@@@ -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
                        nodhcp)
                                DHCP=""
                                export DHCP
 -                              NODHCP="true"
 +                              NODHCP="Yes"
                                export NODHCP
                                ;;
  
                        ethdevice=*)
 -                              DEVICE="${_PARAMETER#ethdevice=}"
 -                              ETHDEVICE="${DEVICE}"
 -                              export DEVICE ETHDEVICE
 +                              ETHDEVICE="${_PARAMETER#ethdevice=}"
 +                              export ETHDEVICE
                                ;;
  
                        ethdevice-timeout=*)
                                export FROMISO
                                ;;
  
 +                      ignore_bootid)
 +                              IGNORE_BOOTID="Yes"
 +                              export IGNORE_BOOTID
 +                              ;;
 +
                        ignore_uuid)
                                IGNORE_UUID="true"
                                export IGNORE_UUID
                                ;;
  
                        ip=*)
 -                              STATICIP="${_PARAMETER#ip=}"
 -
 -                              if [ -z "${STATICIP}" ]
 -                              then
 -                                      STATICIP="frommedia"
 -                              fi
 -
 +                              # copy complete ip=args into staticip, and
 +                              # keep multiple uses.
 +                              STATICIP="${STATICIP} ${_PARAMETER}"
                                export STATICIP
                                ;;
  
                                export NFS_COW
                                ;;
  
 +                      nodhcphostname)
 +                              NODHCPHOSTNAME="Yes"
 +                              export NODHCPHOSTNAME
 +                              ;;
 +
                        nofstab)
                                NOFSTAB="true"
                                export NOFSTAB
                                ramdisk_size="${_PARAMETER#ramdisk-size=}"
                                ;;
  
+                       overlay-size=*)
+                               OVERLAY_SIZE="${_PARAMETER#overlay-size=}"
+                               export OVERLAY_SIZE
+                               ;;
                        persistence)
                                PERSISTENCE="true"
                                export PERSISTENCE
                                UNIONTYPE="${_PARAMETER#union=}"
                                export UNIONTYPE
                                ;;
 +
 +                      vlan=*)
 +                              VLANS="${VLANS} ${_PARAMETER#vlan=}"
 +                              export VLANS
 +                              ;;
                esac
        done
  
diff --combined components/9990-main.sh
@@@ -111,10 -111,10 +111,10 @@@ Live (
        then
                losetup -d /dev/loop0
  
-               if is_mountpoint /live/fromiso
+               if is_mountpoint /run/live/fromiso
                then
-                       umount /live/fromiso
-                       rmdir --ignore-fail-on-non-empty /live/fromiso \
+                       umount /run/live/fromiso
+                       rmdir --ignore-fail-on-non-empty /run/live/fromiso \
                                >/dev/null 2>&1 || true
                fi
        fi
                mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}"
        fi
  
-       # At this point /root should contain the final root filesystem.
-       # Move all mountpoints below /live into /root/lib/live/mount.
-       # This has to be done after mounting the root filesystem to /
-       # otherwise these mount points won't be accessible from the running system.
-       for _MOUNT in $(cat /proc/mounts | cut -f 2 -d " " | grep -e "^/live/")
-       do
-               local newmount
-               newmount="${rootmnt}/lib/live/mount/${_MOUNT#/live/}"
-               mkdir -p "${newmount}"
-               mount -o move "${_MOUNT}" "${newmount}" > /dev/null 2>&1 || \
-               mount -o bind "${_MOUNT}" "${newmount}" > /dev/null || \
-               log_warning_msg "W: failed to move or bindmount ${_MOUNT} to ${newmount}"
-       done
        if [ -n "${ROOT_PID}" ]
        then
                echo "${ROOT_PID}" > "${rootmnt}"/lib/live/root.pid
        then
                losetup -d /dev/loop0
  
-               if is_mountpoint /root/lib/live/mount/findiso
+               if is_mountpoint /run/live/findiso
                then
-                       umount /root/lib/live/mount/findiso
-                       rmdir --ignore-fail-on-non-empty /root/lib/live/mount/findiso \
+                       umount /run/live/findiso
+                       rmdir --ignore-fail-on-non-empty /run/live/findiso \
                                >/dev/null 2>&1 || true
                fi
        fi
        else
                DNSFILE="${rootmnt}/etc/resolv.conf"
        fi
-       if [ -f /etc/resolv.conf ] && [ ! -s ${DNSFILE} ]
+       if [ -f /etc/resolv.conf ] && ! grep -E -q -v '^[[:space:]]*#|^[[:space:]]*$' ${DNSFILE}
        then
                log_begin_msg "Copying /etc/resolv.conf to ${DNSFILE}"
                cp -v /etc/resolv.conf ${DNSFILE}
                panic "A wrong rootfs was mounted."
        fi
  
+       # avoid breaking existing user scripts that rely on the old path
+       # 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
        Fstab
        Netbase
  
        Swap
  
 +      Grml_Networking
 +
        exec 1>&6 6>&-
        exec 2>&7 7>&-
        kill ${tailpid}
-       [ -w "${rootmnt}/var/log/" ] && mkdir -p "${rootmnt}/var/log/live" && cp boot.log "${rootmnt}/var/log/live" 2>/dev/null
+       [ -w "${rootmnt}/var/log/" ] && mkdir -p "${rootmnt}/var/log/live" && ( \
+                               cp boot.log "${rootmnt}/var/log/live" 2>/dev/null; \
+                               cp fsck.log "${rootmnt}/var/log/live" 2>/dev/null )
  }
@@@ -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 ]
@@@ -131,6 -95,7 +131,7 @@@ is_nice_device (
  
  check_dev ()
  {
+       local force fix
        sysdev="${1}"
        devname="${2}"
        skip_uuid_check="${3}"
  
                if [ "$ISO_DEVICE" = "/" ]
                then
-                       echo "Warning: device for bootoption fromiso= ($FROMISO) not found.">>/boot.log
+                       # not a block device, check if it's an iso file, for
+                       # example an ISO when booting on an ONIE system
+                       if echo "${FROMISO}" | grep -q "\.iso$"
+                       then
+                               fs_type=$(get_fstype "${FROMISO}")
+                               if is_supported_fs ${fs_type}
+                               then
+                                       mkdir /run/live/fromiso
+                                       mount -t $fs_type "${FROMISO}" /run/live/fromiso
+                                       if [ "$?" != 0 ]
+                                       then
+                                               echo "Warning: unable to mount ${FROMISO}." >>/boot.log
+                                       fi
+                                       devname="/run/live/fromiso"
+                               fi
+                       else
+                               echo "Warning: device for bootoption fromiso= ($FROMISO) not found.">>/boot.log
+                       fi
                else
                        fs_type=$(get_fstype "${ISO_DEVICE}")
                        if is_supported_fs ${fs_type}
                        then
-                               mkdir /live/fromiso
-                               mount -t $fs_type "$ISO_DEVICE" /live/fromiso
+                               mkdir /run/live/fromiso
+                               mount -t $fs_type "$ISO_DEVICE" /run/live/fromiso
                                ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
-                               loopdevname=$(setup_loop "/live/fromiso/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+                               loopdevname=$(setup_loop "/run/live/fromiso/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
                                devname="${loopdevname}"
                        else
                                echo "Warning: unable to mount $ISO_DEVICE." >>/boot.log
        then
                devuid=$(blkid -o value -s UUID "$devname")
                [ -n "$devuid" ] && grep -qs "\<$devuid\>" /var/lib/live/boot/devices-already-tried-to-mount && continue
+               for _PARAMETER in ${LIVE_BOOT_CMDLINE}
+               do
+                       case "${_PARAMETER}" in
+                               forcefsck)
+                                       FORCEFSCK="true"
+                                       ;;
+                       esac
+               done
+               if [ "${PERSISTENCE_FSCK}" = "true" ] ||  [ "${PERSISTENCE_FSCK}" = "yes" ] || [ "${FORCEFSCK}" = "true" ]
+               then
+                       force=""
+                       if [ "$FORCEFSCK" = "true" ]
+                       then
+                               force="-f"
+                       fi
+                       fix="-a"
+                       if [ "$FSCKFIX" = "true" ] || [ "$FSCKFIX" = "yes" ]
+                       then
+                               fix="-y"
+                       fi
+                       fsck $fix $force ${devname} >> fsck.log 2>&1
+               fi
                mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
                [ -n "$devuid" ] && echo "$devuid" >> /var/lib/live/boot/devices-already-tried-to-mount
  
                        if [ -f ${mountpoint}/${FINDISO} ]
                        then
                                umount ${mountpoint}
-                               mkdir -p /live/findiso
-                               mount -t ${fstype} -o ro,noatime "${devname}" /live/findiso
-                               loopdevname=$(setup_loop "/live/findiso/${FINDISO}" "loop" "/sys/block/loop*" 0 "")
+                               mkdir -p /run/live/findiso
+                               mount -t ${fstype} -o ro,noatime "${devname}" /run/live/findiso
+                               loopdevname=$(setup_loop "/run/live/findiso/${FINDISO}" "loop" "/sys/block/loop*" 0 "")
                                devname="${loopdevname}"
                                mount -t iso9660 -o ro,noatime "${devname}" ${mountpoint}
                        else
                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 -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
  
@@@ -726,7 -748,7 +771,7 @@@ mount_persistence_media (
  
        # get_custom_mounts() might call this with a directory path instead
        # of a block device path. This means we have found sub-directory path
-       # underneath /lib/live/mounts/persistence, so we're done
+       # underneath /run/live/persistence, so we're done
        if [ -d "${device}" ]
        then
                echo "${device}"
                return 1
        fi
  
-       backing="/live/persistence/$(basename ${device})"
+       backing="/run/live/persistence/$(basename ${device})"
  
        mkdir -p "${backing}"
        old_backing="$(where_is_mounted ${device})"
@@@ -1049,7 -1071,7 +1094,7 @@@ find_persistence_media (
        # in one union together.
        #
        black_listed_devices=""
-       for d in /live/rootfs/* /live/findiso /live/fromiso
+       for d in /run/live/rootfs/* /run/live/findiso /run/live/fromiso
        do
                black_listed_devices="${black_listed_devices} $(what_is_mounted_on d)"
        done
@@@ -1364,7 -1386,7 +1409,7 @@@ do_union (
  
  get_custom_mounts ()
  {
-       # Side-effect: leaves $devices with persistence.conf mounted in /live/persistence
+       # Side-effect: leaves $devices with persistence.conf mounted in /run/live/persistence
        # Side-effect: prints info to file $custom_mounts
  
        local custom_mounts devices bindings links
  
                if [ -n "${LIVE_BOOT_DEBUG}" ] && [ -e "${include_list}" ]
                then
-                       cp ${include_list} /live/persistence/${persistence_list}.${device_name}
+                       cp ${include_list} /run/live/persistence/${persistence_list}.${device_name}
                fi
  
                while read dir options # < ${include_list}
                                continue
                        fi
  
-                       if trim_path ${dir} | grep -q -e "^[^/]" -e "^/lib" -e "^/lib/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$"
+                       if trim_path ${dir} | grep -q -e "^[^/]" -e "^/lib" -e "^/run/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$"
                        then
-                               log_warning_msg "Skipping unsafe custom mount ${dir}: must be an absolute path containing neither the \".\" nor \"..\" special dirs, and cannot be \"/lib\", or \"/lib/live\" or any of its sub-directories."
+                               log_warning_msg "Skipping unsafe custom mount ${dir}: must be an absolute path containing neither the \".\" nor \"..\" special dirs, and cannot be \"/lib\", or \"/run/live\" or any of its sub-directories."
                                continue
                        fi
  
@@@ -1580,7 -1602,7 +1625,7 @@@ activate_custom_mounts (
                rootfs_dest_backing=""
                if [ -n "${opt_link}" ] || [ -n "${opt_union}" ]
                then
-                       for d in /live/rootfs/*
+                       for d in /run/live/rootfs/*
                        do
                                if [ -n "${rootmnt}" ]
                                then
                local cow_dir links_source
                if [ -n "${opt_link}" ] && [ -z "${PERSISTENCE_READONLY}" ]
                then
-                       link_files ${source} ${dest} "s|^/live/|/lib/live/mount/|"
+                       link_files ${source} ${dest} ""
                elif [ -n "${opt_link}" ] && [ -n "${PERSISTENCE_READONLY}" ]
                then
-                       mkdir -p ${rootmnt}/lib/live/mount/persistence
-                       links_source=$(mktemp -d ${rootmnt}/lib/live/mount/persistence/links-source-XXXXXX)
+                       mkdir -p /run/live/persistence
+                       links_source=$(mktemp -d /run/live/persistence/links-source-XXXXXX)
                        chown_ref ${source} ${links_source}
                        chmod_ref ${source} ${links_source}
                        # We put the cow dir in the below strange place to
                        # has its own directory and isn't nested with some
                        # other custom mount (if so that mount's files would
                        # be linked, causing breakage.
-                       cow_dir="/live/overlay/lib/live/mount/persistence/$(basename ${links_source})"
+                       cow_dir="/run/live/overlay/run/live/persistence/$(basename ${links_source})"
                        mkdir -p ${cow_dir}
                        chown_ref "${source}" "${cow_dir}"
                        chmod_ref "${source}" "${cow_dir}"
                        # bind-mount and union mount are handled the same
                        # in read-only mode, but note that rootfs_dest_backing
                        # is non-empty (and necessary) only for unions
-                       cow_dir="/live/overlay/${dest}"
+                       cow_dir="/run/live/overlay/${dest}"
                        if [ -e "${cow_dir}" ] && [ -z "${opt_link}" ]
                        then
                                # If an earlier custom mount has files here
                        mkdir -p ${cow_dir}
                        chown_ref "${source}" "${cow_dir}"
                        chmod_ref "${source}" "${cow_dir}"
+                       if [ "${UNIONTYPE}" = "overlay" ]
+                       then
+                               # When we use overlay we add the "/rw" postfix to our source when using it
+                               # as upper layer. Therefore we also have to add it here when using it as
+                               # the lower layer.
+                               source="${source}/rw"
+                       fi
                        do_union ${dest} ${cow_dir} ${source} ${rootfs_dest_backing}
                fi
  
@@@ -9,10 -9,6 +9,6 @@@ Netbase (
                return
        fi
  
-       # FIXME: stop hardcoding overloading of initramfs-tools functions
-       . /scripts/functions
-       . /lib/live/boot/9990-initramfs-tools.sh
        log_begin_msg "Preconfiguring networking"
  
        IFFILE="/root/etc/network/interfaces"
@@@ -49,6 -45,7 +45,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,6 -63,17 +62,6 @@@ 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 [ -n "${NODHCP}" ]
diff --combined debian/changelog
 -live-boot (1:20170112) unstable; urgency=medium
+ live-boot (1:20180603) unstable; urgency=medium
+   [ Luca Boccassi ]
+   * Mark live-boot-doc as Multi-Arch: foreign
+   * Remove --parallel from dh to fix Lintian Warning.
+   [ Benjamin Drung ]
+   * Fix resolving FQDN given by DHCP
+   * Double quote to prevent globbing and word splitting
+  -- RaphaĆ«l Hertzog <hertzog@debian.org>  Sun, 03 Jun 2018 23:00:11 +0200
+ live-boot (1:20180328) unstable; urgency=low
+   [ RaphaĆ«l Hertzog ]
+   * Fix read-only persistence mode with overlayfs. Closes: #877776
+     Thanks to Ronny Standtke <ronny.standtke@fhnw.ch> for the patch.
+   * Add a small warning in the long description that the
+     package must not be installed on a regular system, but only in
+     a live image. Closes: #884886
+   * Strip comments from checksums files passed to "shaXsum -c"
+     Thanks to Andreas Heinlein for the report (Closes: #856482)
+   [ Steve McIntyre ]
+   * Repo moved to salsa
+   [ Benjamin Drung ]
+   * Don't replace busybox's wget by the true wget.
+     It was likely done for https support but since buster the busybox
+     provided wget has https support too. We save a lot of space by
+     doing so (8 Mb). (Closes: #885455)
+   * Avoid double slashes in some paths (Closes: #885453)
+   * Support setting upperdir tmpfs size with overlay-size boot parameter
+     (Closes: #885466)
+   * Simplify mount point handling by using /run/live instead of /lib/live/mount
+     (Closes: #886328)
+   * Add configuration variables to build a stripped down initrd
+     (Closes: #886337)
+   [ Daniel Reichelt ]
+   * Use klibc's mount again for fuse mounts (Closes: #868559)
+   [ raizo62 ]
+   * Update DNSFILE even if DNSFILE contains only commented or empty lines
+   [ Sameer Agrawal ]
+   * Fix ifconfig parsing (Closes: #892772)
+   [ Chas Williams ]
+   * Add back persistence fsck option
+   * Remove workaround for ipconfig issues
+   [ Benjamin Drung ]
+   * Remove sourcing /scripts/functions in components
+   * Support live-{top,premount,bottom} hooks (Closes: #884355)
+   [ Luca Boccassi ]
+   * Add backward compatibility rbind mount /lib/live/mount -> /run/live.
+     The paths used in the current released versions of live-boot are a
+     form of public API, and existing applications and scripts might rely
+     on them. Do a recursive bind mount of the new path on the previous one
+     so that they do not break on upgrade (see #886328).
+     This backward-compatible mount point will be deprecated and removed
+     before the Bullseye (Debian 11) release. Users are recommended to start
+     migrating to the new /run/live path as soon as possible.
+   [ Erik Ziegenbalg ]
+   * fromiso: add support for local ISO (ONIE)
+   [ Luca Boccassi ]
+   * Clarify FROMISO documentation in live-boot manpage
+   * Use HTTPS in debian/copyright (policy 4.0.0).
+   * Remove dead link to live-systems.org from debian/copyright.
+   * Bump Standards-Version to 4.1.3, no changes.
+   * Add myself to Uploaders.
+  -- Luca Boccassi <bluca@debian.org>  Wed, 28 Mar 2018 20:07:39 +0100
+ live-boot (1:20170623) unstable; urgency=medium
+   * Do not duplicate files in /lib/live/boot/ and /bin/boot/ in the initrd.
+     Closes: #864385 Thanks to Daniel Reichelt <debian@nachtgeist.net> for the
+     patch.
+   * Take into account the fact that udevadm is now in /bin and no longer in
+     /sbin. Closes: #852570
+   * Add myself to Uploaders.
+   * Bump debhelper compat to 10.
+   * Bump Standards-Version to 4.0.0.
+   * Fix spelling errors in live-boot(7).
+  -- RaphaĆ«l Hertzog <hertzog@debian.org>  Fri, 23 Jun 2017 14:41:06 +0200
 +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
  
  
   -- 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 ]
@@@ -138,27 -159,6 +230,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 ]
@@@ -240,26 -240,6 +332,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 ]
  
   -- 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 ]
  
   -- 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.
@@@ -320,32 -288,6 +412,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.
@@@ -465,49 -407,6 +557,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
@@@ -700,13 -599,6 +792,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 ]
@@@ -764,16 -656,6 +856,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 ]
  
   -- 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 ]
  
   -- 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
@@@ -1170,76 -1025,6 +1262,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 ]
@@@ -1413,39 -1198,6 +1505,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
@@@ -1552,38 -1304,6 +1644,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
@@@ -1606,51 -1326,6 +1698,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
@@@ -1,26 -1,24 +1,26 @@@
  Source: live-boot
  Section: misc
  Priority: optional
 -Maintainer: Live Systems 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>
  Build-Depends:
-  debhelper (>= 9),
- Standards-Version: 3.9.8
+  debhelper (>= 10),
+ Standards-Version: 4.1.3
 -Homepage: https://debian-live.alioth.debian.org/live-boot/
 -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-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,
 + eject,
 + file,
   rsync,
   uuid-runtime,
  Suggests:
   curlftpfs,
   httpfs2,
   wget,
 +Conflicts: live-boot
 +Replaces: live-boot
 +Provides: live-boot
  Description: Live System Boot Components
 - The Live Systems 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).
+  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)
   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,
@@@ -78,10 -70,7 +80,11 @@@ Description: Live System Boot Component
   systems and the official Debian Live images themselves.
   .
   live-boot contains the components to configure a live system during the boot
-  process (early userspace).
+  process (early userspace). Do not install this package on your regular system,
+  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/rules
@@@ -1,18 -1,17 +1,18 @@@
  #!/usr/bin/make -f
  
  %:
-       dh ${@} --parallel
+       dh ${@}
  
  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
 +      rm -f debian/lib/live/boot/FIXME
  
        # 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