Update changelog for 1:20210122 release

[live-boot-grml.git] / components / 9990-main.sh

diff --git a/components/9990-main.sh b/components/9990-main.sh
index 7e385f5..b50952f 100755 (executable)
--- a/components/9990-main.sh
+++ b/components/9990-main.sh
@@ -33,7 +33,7 @@ Live ()
        # Needed here too because some things (*cough* udev *cough*)
        # changes the timeout
 
-       if [ ! -z "${NETBOOT}" ] || [ ! -z "${FETCH}" ] || [ ! -z "${HTTPFS}" ] || [ ! -z "${FTPFS}" ]
+       if [ -n "${NETBOOT}" ] || [ -n "${FETCH}" ] || [ -n "${HTTPFS}" ] || [ -n "${FTPFS}" ]
        then
                if do_netmount
                then
@@ -52,7 +52,7 @@ Live ()
                else
                        if [ -x /usr/bin/memdiskfind ]
                        then
-                               if ! MEMDISK=$(/usr/bin/memdiskfind)
+                               if MEMDISK=$(/usr/bin/memdiskfind)
                                then
                                        # We found a memdisk, set up phram
                                        # Sometimes "modprobe phram" can not successfully create /dev/mtd0.
@@ -165,6 +165,20 @@ Live ()
                fi
        fi
 
+       if [ -f /etc/hostname ] && ! grep -E -q -v '^[[:space:]]*(#|$)' "${rootmnt}/etc/hostname"
+       then
+               log_begin_msg "Copying /etc/hostname to ${rootmnt}/etc/hostname"
+               cp -v /etc/hostname "${rootmnt}/etc/hostname"
+               log_end_msg
+       fi
+
+       if [ -f /etc/hosts ] && ! grep -E -q -v '^[[:space:]]*(#|$|(127.0.0.1|::1|ff02::[12])[[:space:]])' "${rootmnt}/etc/hosts"
+       then
+               log_begin_msg "Copying /etc/hosts to ${rootmnt}/etc/hosts"
+               cp -v /etc/hosts "${rootmnt}/etc/hosts"
+               log_end_msg
+       fi
+
        if [ -L /root/etc/resolv.conf ] ; then
                # assume we have resolvconf
                DNSFILE="${rootmnt}/etc/resolvconf/resolv.conf.d/base"