Merge remote-tracking branch 'upstream/master'

Syncing with Debian's live-boot as of
commit 6cee205c9b6c7eb9c48bf66bfdd75ab04e38308c (tag: debian/1%20210208, upstream/master)

diff --git a/Makefile b/Makefile
index d1ecb72..c64c8c3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -59,8 +59,8 @@ install:
        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 @@ 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 --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook
index b37f54f..7a2bd13 100755 (executable)
--- a/backend/initramfs-tools/live.hook
+++ b/backend/initramfs-tools/live.hook
@@ -16,6 +16,12 @@ do
        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
@@ -240,7 +246,7 @@ fi
 # libnss_files.so.*:  /etc/hosts and /etc/passwd
 # libnss_compat.so.*: /etc/passwd
 
-for _SHLIB in $(find /lib /usr/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.*' | grep -v '/lib/live')
 do
        copy_exec "${_SHLIB}"
 done
@@ -251,4 +257,16 @@ then
        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
+
+if [ -x /sbin/ethtool ]
+then
+       copy_exec /sbin/ethtool
+fi
+
 [ "${QUIET}" ] || echo .

diff --git a/components/0020-read-only b/components/0020-read-only
index f56b8cf..84d73ef 100755 (executable)
--- a/components/0020-read-only
+++ b/components/0020-read-only
@@ -29,27 +29,40 @@ Read_only ()
 
        # Marking some block devices as read-only to ensure that nothing
        # gets written as linux still writes to 'only' read-only mounted filesystems.
-       LIVE_READ_ONLY_DEVICES="${LIVE_READ_ONLY_DEVICES:-/dev/sd* /dev/vd*}"
+       LIVE_READ_ONLY_DEVICES="${LIVE_READ_ONLY_DEVICES:-/dev/* /dev/*/*}"
 
        for _DEVICE in $(echo ${LIVE_READ_ONLY_DEVICES} | sed -e 's|,| |g')
        do
+               # ignore symlinks like /dev/cdrom, /dev/block/* which point to actual devices
+               if [ -L "${_DEVICE}" ]
+               then
+                       continue
+               fi
+
+               # only consider actual block devices
                if [ ! -b "${_DEVICE}" ]
                then
                        continue
                fi
 
-               echo -n "live-boot: Setting ${_DEVICE} read-only..." > /dev/console
+               if ! blockdev --getsz "${_DEVICE}" >/dev/null 2>&1
+               then
+                       printf " * live-boot: Ignoring '%-10s' (not present?)\n" "${_DEVICE}" > /dev/console
+                       continue
+               fi
+
+               printf " * live-boot: Setting %-10s read-only..." "${_DEVICE}" > /dev/console
 
-               blockdev --setro ${_DEVICE}
+               blockdev --setro "${_DEVICE}"
                _RETURN="${?}"
 
                case "${_RETURN}" in
                        0)
-                               echo " done, use 'blockdev --setrw ${_DEVICE}' to set read-write." > /dev/console
+                               printf " done, use 'blockdev --setrw %-10s' to set read-write.\n" "${_DEVICE}" > /dev/console
                                ;;
 
                        *)
-                               echo " failed." > /dev/console
+                               printf " failed.\n" > /dev/console
                                ;;
                esac
        done

diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old
index 6e9082d..1504e1e 100755 (executable)
--- a/components/9990-cmdline-old
+++ b/components/9990-cmdline-old
@@ -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
@@ -86,6 +92,11 @@ Cmdline_old ()
                                export FROMISO
                                ;;
 
+                       ignore_bootid)
+                               IGNORE_BOOTID="Yes"
+                               export IGNORE_BOOTID
+                               ;;
+
                        ignore_uuid)
                                IGNORE_UUID="true"
                                export IGNORE_UUID
@@ -147,6 +158,11 @@ Cmdline_old ()
                                export NFS_COW
                                ;;
 
+                       nodhcphostname)
+                               NODHCPHOSTNAME="Yes"
+                               export NODHCPHOSTNAME
+                               ;;
+
                        nofstab)
                                NOFSTAB="true"
                                export NOFSTAB
@@ -253,6 +269,11 @@ Cmdline_old ()
                                UNIONTYPE="${_PARAMETER#union=}"
                                export UNIONTYPE
                                ;;
+
+                       vlan=*)
+                               VLANS="${VLANS} ${_PARAMETER#vlan=}"
+                               export VLANS
+                               ;;
                esac
        done
 

diff --git a/components/9990-grml-networking.sh b/components/9990-grml-networking.sh
new file mode 100644 (file)
index 0000000..b899461
--- /dev/null
+++ b/components/9990-grml-networking.sh
@@ -0,0 +1,156 @@
+#!/bin/sh
+
+#set -e
+
+Grml_Networking () {
+
+if [ -n "${NONETWORKING}" ]; then
+   return 0
+fi
+
+log_begin_msg "Preconfiguring Grml networking"
+
+modprobe af_packet # req'd for DHCP
+
+# initialize udev
+# (this /might/ be required for firmware loading to complete)
+if grep -q noudev /proc/cmdline; then
+   log_begin_msg "Networking: Skipping udev as requested via bootoption noudev."
+else
+   udevadm trigger
+   udevadm settle
+fi
+
+if [ -n "${IP}" ]; then
+   # call into initramfs-tools provided network setup functions, so basic
+   # networking is fine.
+   log_begin_msg "Networking: Waiting for basic network to come up..."
+   configure_networking
+fi
+
+# prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)
+IFFILE="/root/etc/network/interfaces"
+if [ -L /root/etc/resolv.conf ] ; then
+  # assume we have resolvconf
+  RESOLVCONF=/root/etc/resolvconf/resolv.conf.d/base
+else
+  RESOLVCONF="/root/etc/resolv.conf"
+fi
+
+# config for loopback networking
+cat > $IFFILE << EOF
+# Initially generated on boot by initramfs,
+# interfaces(5) file used by ifup(8) and ifdown(8)
+
+# Include files from /etc/network/interfaces.d:
+source /etc/network/interfaces.d/*
+
+auto lo
+iface lo inet loopback
+
+EOF
+
+unset HOSTNAME
+
+# generate config for each present network device
+for interface in /sys/class/net/* ; do
+    [ -e ${interface} ] || continue
+    interface=$(basename ${interface})
+    [ "${interface}" = "lo" ] && continue
+    method="dhcp"
+
+    # NODHCP or a previously run ipconfig mean that ifupdown should never
+    # touch this interface (IP-stack wise).
+    netconfig=/run/net-${interface}.conf
+    if [ -n "$NODHCP" ] || [ -e "${netconfig}" ]; then
+        method="manual"
+    fi
+
+    # if boot option "nodhcp" is set but also boot option "dhcp" is
+    # set, then dhcp should win over it as we default to dhcp and if
+    # nodhcp is used as default boot option but "dhcp" is added then it
+    # would be confusing to not get a working network setup
+    if [ "$DHCP" = "true" ] ; then
+        method="dhcp"
+    fi
+
+    if [ -n "$VLANS" ] ; then
+      modprobe 8021q
+
+      # vlan=<vid>:<phydevice>
+      for line in $(echo $VLANS | sed 's/ /\n'/) ; do
+        vlandev=${line#*:}
+        vlanid=${line%:*}
+
+        if [ -n "$vlandev" ] && [ -n "$vlanid" ] ; then
+          case "$vlandev" in
+            "$interface")
+              vlan_raw_dev=$interface
+              interface="${vlandev}.${vlanid}"
+              ;;
+          esac
+        fi
+      done
+    fi
+
+    if [ -n "$vlan_raw_dev" ] ; then
+      cat >> $IFFILE << EOF
+auto ${interface}
+iface ${interface} inet ${method}
+        vlan-raw-device $vlan_raw_dev
+EOF
+    else
+      cat >> $IFFILE << EOF
+allow-hotplug ${interface}
+iface ${interface} inet ${method}
+EOF
+    fi
+
+    unset vlandev vlanid vlan_raw_dev # unset variables to have clean state for next device
+
+    # DNS for resolvconf and /etc/resolv.conf
+    if [ -e "${netconfig}" ]; then
+        . "${netconfig}"
+        if [ -n "${DNSDOMAIN}" ]; then
+            echo "    dns-search ${DNSDOMAIN}" >> $IFFILE
+        fi
+        # make sure we don't have any 0.0.0.0 nameservers
+        IPV4DNSLIST=""
+        for IPV4DNS in ${IPV4DNS0} ${IPV4DNS1}; do
+            [ -n "${IPV4DNS}" ] || continue
+            [ "${IPV4DNS}" != "0.0.0.0" ] || continue
+            IPV4DNSLIST="${IPV4DNSLIST}${IPV4DNS} "
+        done
+        if [ -n "${IPV4DNSLIST}" ]; then
+            echo "    dns-nameservers ${IPV4DNSLIST}" >> $IFFILE
+            for IPV4DNS in ${IPV4DNSLIST}; do
+                echo "nameserver ${IPV4DNS}" >> $RESOLVCONF
+            done
+        fi
+    fi
+
+    if [ -z "$NODHCPHOSTNAME" -a -n "$HOSTNAME" ]; then
+        echo $HOSTNAME > /root/etc/hostname
+    fi
+
+    unset DEVICE IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY IPV4DNS0 IPV4DNS1 HOSTNAME DNSDOMAIN NISDOMAIN ROOTSERVER ROOTPATH filename
+    unset IPV4DNS IPV4DNSLIST
+
+    echo>> $IFFILE
+done
+
+# dns bootoption
+if [ -n "$DNSSERVERS" ]
+then
+       # disable any existing entries
+       if [ -r $RESOLVCONF ]
+       then
+               sed -i 's/nameserver/# nameserver/' $RESOLVCONF
+       fi
+       for i in $DNSSERVERS
+       do
+               echo "nameserver $i" >> $RESOLVCONF
+       done
+fi
+
+}

diff --git a/components/9990-initramfs-tools.sh b/components/9990-initramfs-tools.sh
index b251754..e6b4282 100755 (executable)
--- a/components/9990-initramfs-tools.sh
+++ b/components/9990-initramfs-tools.sh
@@ -52,14 +52,20 @@ panic()
        printf "\n\n"
        printf "  \033[1;37mBOOT FAILED!\033[0m\n"
        printf "\n"
-       printf "  This Live System image failed to boot.\n\n"
+       printf "  This image failed to boot.\n\n"
 
-       printf "  Please file a bug against the 'live-boot' package or email the Debian Live\n"
-       printf "  mailing list at <debian-live@lists.debian.org>, making sure to note the\n"
-       printf "  exact version, name and distribution of the image you were attempting to boot.\n\n"
+       printf "  Please file a bug at your distributors bug tracking system, making\n"
+       printf "  sure to note the exact version, name and distribution of the image\n"
+       printf "  you were attempting to boot.\n\n"
+
+       if [ -r /etc/grml_version ]
+       then
+               GRML_VERSION="$(cat /etc/grml_version)"
+               printf "  $GRML_VERSION\n\n"
+       fi
 
        printf "  The file ${LIVELOG} contains some debugging information but booting with the\n"
-       printf "  ${DEBUG} command-line parameter will greatly increase its verbosity which is\n"
+       printf "  ${DEBUG}=1 command-line parameter will greatly increase its verbosity which is\n"
        printf "  extremely useful when diagnosing issues.\n\n"
 
        if [ -n "${panic}" ]; then

diff --git a/components/9990-main.sh b/components/9990-main.sh
index b50952f..7fb7ed3 100755 (executable)
--- a/components/9990-main.sh
+++ b/components/9990-main.sh
@@ -52,25 +52,31 @@ Live ()
                else
                        if [ -x /usr/bin/memdiskfind ]
                        then
-                               if MEMDISK=$(/usr/bin/memdiskfind)
+                               if ! dd if=/dev/mem of=/dev/zero bs=1 count=1 >/dev/null 2>&1
                                then
-                                       # We found a memdisk, set up phram
-                                       # 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
+                                       log_begin_msg "access to /dev/mem is restriced, skipping memdiskfind"
+                                       log_end_msg
+                               else
+                                       if MEMDISK=$(/usr/bin/memdiskfind)
+                                       then
+                                               # We found a memdisk, set up phram
+                                               # 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
+                                       fi
                                fi
                        fi
 
@@ -205,10 +211,15 @@ Live ()
        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 --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index 7994ecd..8551385 100755 (executable)
--- a/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@ -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 ]
@@ -103,7 +139,20 @@ check_dev ()
        # support for fromiso=.../isofrom=....
        if [ -n "$FROMISO" ]
        then
-               ISO_DEVICE=$(dirname $FROMISO)
+               fs_type="${FROMISO%%:*}"
+               fs_type_auto='1'
+               ISO_DEVICE="${FROMISO}"
+               if echo "${fs_type}" | grep -q '[^[:alnum:]_-]'; then
+                       # Not a valid file system name. Treat as part of the
+                       # path, and, especially, use autodetection.
+                       fs_type=''
+               else
+                       # Looks like a file system specification, treat it
+                       # like that.
+                       fs_type_auto='0'
+                       ISO_DEVICE="${ISO_DEVICE#*:}"
+               fi
+               ISO_DEVICE=$(dirname "${ISO_DEVICE}")
                if ! [ -b $ISO_DEVICE ]
                then
                        # to support unusual device names like /dev/cciss/c0d0p1
@@ -124,14 +173,17 @@ check_dev ()
                        # example an ISO when booting on an ONIE system
                        if echo "${FROMISO}" | grep -q "\.iso$"
                        then
-                               fs_type=$(get_fstype "${FROMISO}")
+                               if [ '0' -ne "${fs_type_auto}" ]; then
+                                       # Autodetect fs type if not overridden.
+                                       fs_type=$(get_fstype "${FROMISO}")
+                               fi
                                if is_supported_fs ${fs_type}
                                then
                                        mkdir /run/live/fromiso
-                                       mount -t $fs_type "${FROMISO}" /run/live/fromiso
+                                       mount -t "${fs_type}" -o 'ro' "${FROMISO}" '/run/live/fromiso'
                                        if [ "$?" != 0 ]
                                        then
-                                               echo "Warning: unable to mount ${FROMISO}." >>/boot.log
+                                               echo "Warning: unable to mount ${FROMISO} (type ${fs_type})." >>/boot.log
                                        fi
                                        devname="/run/live/fromiso"
                                fi
@@ -139,16 +191,30 @@ check_dev ()
                                echo "Warning: device for bootoption fromiso= ($FROMISO) not found.">>/boot.log
                        fi
                else
-                       fs_type=$(get_fstype "${ISO_DEVICE}")
+                       # Need to extract actual ISO file path later on,
+                       # initialize first.
+                       iso_name="${FROMISO}"
+
+                       if [ '0' -ne "${fs_type_auto}" ]; then
+                               # Try to auto-detect file system if not
+                               # explicitly provided.
+                               fs_type=$(get_fstype "${ISO_DEVICE}")
+                       else
+                               # Delete file system type override.
+                               iso_name="${iso_name#*:}"
+                       fi
+                       # At this point, the backing device should always be
+                       # at the very front, so remove that - leaving only the
+                       # ISO file path.
+                       iso_name="$(echo "${iso_name}" | sed "s|^${ISO_DEVICE}||")"
                        if is_supported_fs ${fs_type}
                        then
                                mkdir /run/live/fromiso
-                               mount -t $fs_type "$ISO_DEVICE" /run/live/fromiso
-                               ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
-                               loopdevname=$(setup_loop "/run/live/fromiso/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+                               mount -t "${fs_type}" -o 'ro' "$ISO_DEVICE" '/run/live/fromiso'
+                               loopdevname=$(setup_loop "/run/live/fromiso/${iso_name}" "loop" "/sys/block/loop*" "" '')
                                devname="${loopdevname}"
                        else
-                               echo "Warning: unable to mount $ISO_DEVICE." >>/boot.log
+                               echo "Warning: unable to mount $ISO_DEVICE (type ${fs_type})." >>/boot.log
                        fi
                fi
        fi
@@ -259,7 +325,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
@@ -355,19 +421,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
 
@@ -738,7 +791,7 @@ try_mount ()
                        fstype=$(get_fstype "${dev}")
                fi
                mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || \
-               ( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > boot.log && return 0 )
+               ( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" >> boot.log && return 0 )
        fi
 }
 

diff --git a/debian/changelog b/debian/changelog
index bed78db..30128b5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,53 +1,103 @@
-live-boot (1:20210208) unstable; urgency=high
+live-boot (1:20200527+grml.5) unstable; urgency=medium
 
-  [ Steven Shiau ]
-  * Revert commit that forced usage of the last ethernet device making it
-    impossible to boot when the working connection was on another
-    ethernet device
-  * Cleanup the leading space that was causing issues and that resulted
-    in the former wrong change with a sed.
+  * [b727a78] /e/n/i: move sourcing of /etc/network/interfaces.d/ to begin
+    of file
+  * [61b7447] Avoid executing memdiskfind under Secure Boot
 
- -- Raphaël Hertzog <raphael@offensive-security.com>  Mon, 08 Feb 2021 12:18:07 +0100
+ -- Michael Prokop <mika@grml.org>  Sat, 18 Jul 2020 17:02:55 +0200
 
-live-boot (1:20210122) unstable; urgency=medium
+live-boot (1:20200527+grml.4) unstable; urgency=medium
 
-  [ Steven Shiau ]
-  * A workaround to make sure /dev/mtd0 can be created
-  * Use ntfs-3g instead of kernel module ntfs.ko (Closes: #939034)
+  * [b1e38b1] Include ethtool binary for debugging network configuration
+    during network boot
+
+ -- Michael Prokop <mika@grml.org>  Fri, 17 Jul 2020 23:23:08 +0200
+
+live-boot (1:20200527+grml.3) unstable; urgency=medium
+
+  * [b368066] 0020-read-only: iterate over all devices + improve console
+    message layout
+  * [ea4f167] 9990-misc-helpers.sh: ensure to appened to boot.log file
+
+ -- Michael Prokop <mika@grml.org>  Fri, 10 Jul 2020 09:07:01 +0200
+
+live-boot (1:20200527+grml.2) unstable; urgency=medium
+
+  * [2f7a8c9] Add instance for sourcing /etc/network/interfaces.d/
+    only once
+
+ -- Michael Prokop <mika@grml.org>  Tue, 23 Jun 2020 12:22:16 +0200
+
+live-boot (1:20200527+grml.1) unstable; urgency=medium
+
+  [ Michael Prokop ]
+  * Sync with Debian's upstream and release new version
+    (https://salsa.debian.org/live-team/live-boot/),
+    git commit 24f2452
+  * [bcf2959] 9990-grml-networking.sh: support /etc/network/interfaces.d/*
+    in /e/n/i
+  * [b4a7f36] Fix duplicate Homepage header in debian/control
+
+  [ Roland Clobus ]
+  * [cb53729] checkbashisms can be found on salsa.debian.org now.
+  * [d620bde] The homepage is https://wiki.debian.org/DebianLive
+  * [e8e759f] Updated URL to the manual
+  * [01b2c89] Used the same text for po4a as in live-manual.
+  * [b4a78aa] Fixed fetching the version number.
+  * [59a5992] Updated URL to the homepage and manual.
+  * [4969912] Fixed a small typo.
+  * [2cc13e5] Fixed Lintian warning: manpage-section-mismatch
+  * [b50563d] Automatically create a snapshot of the latest package
+  * [3ab3594] Always rebuild po4a.cfg This is needed to ensure that new
+    languages will automatically be found
+  * [866ff26] Delete all generated files. They are generated from the po
+    files.
+  * [1fdc48f] Rebuild the translations
+  * [cf01ed7] New Build-Depends: po4a for the translation files
+  * [2821546] Use 'true' when referring to boolean environment variables
+  * [9188c08] Updated the translation files. The translators can now
+    update their translations.
 
   [ Benjamin Drung ]
-  * components/9990-networking.sh: Add shellcheck override
-  * Fix DNS search entry in /etc/resolv.conf
-  * Fix shellcheck in components/9990-main.sh
-  * Simplify empty check for /etc/resolv.conf
-  * Create /etc/hostname in initramfs
-  * Copy /etc/hostname and /etc/hosts into target
-  * Fix flipped logic for handling memdiskfind
-  * components/9990-main.sh: Fix shellcheck issue SC2236
-  * Fix leading space in DEVICE setting
+  * [f18a282] Also search for libnss_*.so files in /usr/lib (Closes:
+    #930419)
+  * [bac527f] components/9990-networking.sh: Add shellcheck override
+  * [9944436] Fix DNS search entry in /etc/resolv.conf
+  * [07d13d4] Fix shellcheck in components/9990-main.sh
+  * [179707b] Simplify empty check for /etc/resolv.conf
+  * [44c651d] Create /etc/hostname in initramfs
+  * [d9d44fd] Copy /etc/hostname and /etc/hosts into target
+  * [9c27c7a] Fix flipped logic for handling memdiskfind
+  * [9b976b5] components/9990-main.sh: Fix shellcheck issue SC2236
+
+  [ Luca Boccassi ]
+  * [7d09142] Set Rules-Requires-Root: no
+  * [fa4cd2e] Set Standards-Version to 4.3.0
+  * [033a004] Update changelog for 1:20190614 release
+
+  [ Steven Shiau ]
+  * [abfb059] A workaround to make sure /dev/mtd0 can be created
+  * [d825b74] Use ntfs-3g instead of kernel module ntfs.ko.
 
   [ Marcel Partap ]
-  * Accept multiple overlay names from persistence-label parameter
-  * Fix spurious error msgs from live-boot about failed mounts…
-  * Document the fact that persistence-label now accepts a list
-  * Set sticky bit on /var/tmp as well (matching perms in base-files)
+  * [4aa52e5] Accept multiple overlay names from persistence-label
+    parameter
+  * [5bf9f57] Fix spurious error msgs from live-boot about failed mounts…
+  * [7a233a2] Document the fact that persistence-label now accepts a list
+  * [17ffaa3] Set sticky bit on /var/tmp as well (matching perms in base-
+    files)
 
   [ Debian Janitor ]
-  * Update standards version to 4.4.1, no changes needed.
-  * Bump debhelper from old 10 to 12. + debian/rules: Move --fail-missing
-    argument to dh_missing.
-  * Set debhelper-compat version in Build-Depends.
+  * [a51d847] Update standards version to 4.4.1, no changes needed.
+  * [f5c54b7] Bump debhelper from old 10 to 12. + debian/rules: Move
+    --fail-missing argument to dh_missing.
+  * [ca6430e] Set debhelper-compat version in Build-Depends.
 
   [ Lyndon Brown ]
-  * amend copyright
-  * "Live Systems" -> "Debian Live"
-
-  [ Raphaël Hertzog ]
-  * Drop Iain R. Learmonth from Uploaders on his request (Closes: #970288)
-  * Update standards version to 4.5.0, no changes needed.
-  * Update my maintainer email
+  * [0488840] amend copyright
+  * [36d4a16] "Live Systems" -> "Debian Live"
 
- -- Raphaël Hertzog <raphael@offensive-security.com>  Fri, 22 Jan 2021 15:18:23 +0100
+ -- Michael Prokop <mika@grml.org>  Wed, 27 May 2020 14:13:19 +0200
 
 live-boot (1:20190614) unstable; urgency=medium
 
@@ -71,6 +121,38 @@ live-boot (1:20190614) unstable; urgency=medium
 
  -- 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 ]
@@ -163,22 +245,77 @@ live-boot (1:20170623) unstable; urgency=medium
 
  -- 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
 
@@ -194,6 +331,22 @@ 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 ]
@@ -232,6 +385,27 @@ live-boot (5.0~a5-1) unstable; urgency=low
 
  -- 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 ]
@@ -313,6 +487,26 @@ live-boot (4.0.2-1) unstable; urgency=low
 
  -- 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 ]
@@ -330,6 +524,12 @@ live-boot (4.0.1-1) unstable; urgency=low
 
  -- 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 ]
@@ -343,6 +543,12 @@ live-boot (4.0.0-1) unstable; urgency=low
 
  -- 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.
@@ -361,6 +567,32 @@ live-boot (4.0~alpha20-1) unstable; urgency=low
 
  -- 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.
@@ -480,6 +712,49 @@ live-boot (4.0~a14-1) experimental; urgency=low
 
  -- 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
@@ -672,6 +947,13 @@ live-boot (4.0~a1-1) experimental; urgency=low
 
  -- 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 ]
@@ -729,6 +1011,16 @@ live-boot (3.0~b11-1) unstable; urgency=low
 
  -- 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 ]
@@ -754,6 +1046,23 @@ live-boot (3.0~b10-1) unstable; urgency=low
 
  -- 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 ]
@@ -764,6 +1073,16 @@ live-boot (3.0~b9-1) unstable; urgency=low
 
  -- 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
@@ -1098,6 +1417,76 @@ live-boot (3.0~a28-1) experimental; urgency=low
 
  -- 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 ]
@@ -1271,6 +1660,39 @@ live-boot (3.0~a25-1) unstable; urgency=low
 
  -- 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
@@ -1377,6 +1799,38 @@ live-boot (3.0~a20-1) unstable; urgency=low
 
  -- 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
@@ -1399,6 +1853,51 @@ live-boot (3.0~a18-1) unstable; urgency=low
 
  -- 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 --git a/debian/control b/debian/control
index 972c5d6..c88a3fc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,26 @@
 Source: live-boot
 Section: misc
 Priority: optional
-Maintainer: Debian Live Maintainers <debian-live@lists.debian.org>
-Uploaders: Raphaël Hertzog <raphael@offensive-security.com>,
- Luca Boccassi <bluca@debian.org>
+Maintainer: Grml Team <team@grml.org>
+Uploaders: Michael Prokop <mika@grml.org>
 Build-Depends:
  debhelper-compat (= 12),
  po4a,
 Standards-Version: 4.5.0
 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
+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,
@@ -28,18 +29,22 @@ 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
@@ -53,8 +58,12 @@ 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,
@@ -76,3 +85,7 @@ Description: Live System Boot Components (initramfs-tools backend)
  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 --git a/debian/live-boot-doc.install b/debian/live-boot-grml-doc.install
similarity index 100%
rename from debian/live-boot-doc.install
rename to debian/live-boot-grml-doc.install

diff --git a/debian/live-boot-initramfs-tools.postinst b/debian/live-boot-grml-initramfs-tools.postinst
similarity index 100%
rename from debian/live-boot-initramfs-tools.postinst
rename to debian/live-boot-grml-initramfs-tools.postinst

diff --git a/debian/live-boot.bug-presubj b/debian/live-boot-grml.bug-presubj
similarity index 100%
rename from debian/live-boot.bug-presubj
rename to debian/live-boot-grml.bug-presubj

diff --git a/debian/live-boot.bug-script b/debian/live-boot-grml.bug-script
similarity index 100%
rename from debian/live-boot.bug-script
rename to debian/live-boot-grml.bug-script

diff --git a/debian/live-boot.install b/debian/live-boot-grml.install
similarity index 100%
rename from debian/live-boot.install
rename to debian/live-boot-grml.install

diff --git a/debian/rules b/debian/rules
index 96182a3..e19aca4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -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_missing:
        dh_missing --fail-missing