Release new version 1:20210208+grml.5

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

diff --git a/components/9990-main.sh b/components/9990-main.sh
index 4a965d5..063445b 100755 (executable)
--- a/components/9990-main.sh
+++ b/components/9990-main.sh
@@ -33,11 +33,11 @@ Live ()
        # Needed here too because some things (*cough* udev *cough*)
        # changes the timeout
 
-       if [ ! -z "${NETBOOT}" ] || [ ! -z "${FETCH}" ] || [ ! -z "${HTTPFS}" ] || [ ! -z "${FTPFS}" ]
+       if [ -n "${NETBOOT}" ] || [ -n "${FETCH}" ] || [ -n "${HTTPFS}" ] || [ -n "${FTPFS}" ]
        then
                if do_netmount
                then
-                       livefs_root="${mountpoint}"
+                       livefs_root="${mountpoint?}"
                else
                        panic "Unable to find a live file system on the network"
                fi
@@ -52,19 +52,58 @@ Live ()
                else
                        if [ -x /usr/bin/memdiskfind ]
                        then
-                               MEMDISK=$(/usr/bin/memdiskfind)
-
-                               if [ $? -eq 0 ]
+                               if ! dd if=/dev/mem of=/dev/zero bs=1 count=1 >/dev/null 2>&1
                                then
-                                       # We found a memdisk, set up phram
-                                       modprobe phram phram=memdisk,${MEMDISK}
-                                       modprobe phram phram=memdisk,${MEMDISK}
-
-                                       # 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
 
+                       # If the live media location is given via command line and access to it
+                       # involves LVM volumes, the corresponding volumes need to be activated.
+                       IFS=','
+                       for dev in $(echo "$LIVE_MEDIA")
+                       do
+                               case "$dev" in
+                               /dev/mapper/*)
+                                       eval $(dmsetup splitname --nameprefixes --noheadings --rows "${dev#/dev/mapper/}")
+                                       if [ "$DM_VG_NAME" ] && [ "$DM_LV_NAME" ]
+                                       then
+                                               lvm lvchange -aay -y --sysinit --ignoreskippedcluster "$DM_VG_NAME/$DM_LV_NAME"
+                                       fi
+                                       ;;
+                               /dev/*/*)
+                                       # Could be /dev/VG/LV; use lvs to check
+                                       if lvm lvs -- "$dev" >/dev/null 2>&1
+                                       then
+                                               lvm lvchange -aay -y --sysinit --ignoreskippedcluster "$dev"
+                                       fi
+                                       ;;
+                               esac
+                       done
+                       unset IFS
+
                        # Scan local devices for the image
                        i=0
                        while [ "$i" -lt 60 ]
@@ -77,7 +116,7 @@ Live ()
                                fi
 
                                sleep 1
-                               i="$(($i + 1))"
+                               i=$((i + 1))
                        done
                fi
        fi
@@ -111,20 +150,20 @@ 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
 
        if [ -n "${MODULETORAMFILE}" ] || [ -n "${PLAIN_ROOT}" ]
        then
-               setup_unionfs "${livefs_root}" "${rootmnt}"
+               setup_unionfs "${livefs_root}" "${rootmnt?}"
        else
                mac="$(get_mac)"
-               mac="$(echo ${mac} | sed 's/-//g')"
+               mac="$(echo "${mac}" | sed 's/-//g')"
                mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}"
        fi
 
@@ -156,16 +195,30 @@ 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"
        else
                DNSFILE="${rootmnt}/etc/resolv.conf"
        fi
-       if [ -f /etc/resolv.conf ] && ! grep -E -q -v '^[[:space:]]*#|^[[:space:]]*$' ${DNSFILE}
+       if [ -f /etc/resolv.conf ] && ! grep -E -q -v '^[[:space:]]*(#|$)' "${DNSFILE}"
        then
                log_begin_msg "Copying /etc/resolv.conf to ${DNSFILE}"
-               cp -v /etc/resolv.conf ${DNSFILE}
+               cp -v /etc/resolv.conf "${DNSFILE}"
                log_end_msg
        fi
 
@@ -174,11 +227,23 @@ Live ()
                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
 
+       if grep -q debian_networking /proc/cmdline ; then
+               Netbase
+       else
+               Grml_Networking
+       fi
+
        exec 1>&6 6>&-
        exec 2>&7 7>&-
        kill ${tailpid}