# 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
else
if [ -x /usr/bin/memdiskfind ]
then
- MEMDISK=$(/usr/bin/memdiskfind)
-
- if [ $? -eq 0 ]
+ if MEMDISK=$(/usr/bin/memdiskfind)
then
# We found a memdisk, set up phram
- modprobe phram phram=memdisk,${MEMDISK}
- modprobe phram phram=memdisk,${MEMDISK}
+ # Sometimes "modprobe phram" can not successfully create /dev/mtd0.
+ # Have to try several times.
+ max_try=20
+ while [ ! -c /dev/mtd0 ] && [ "$max_try" -gt 0 ]; do
+ modprobe phram "phram=memdisk,${MEMDISK}"
+ sleep 0.2
+ if [ -c /dev/mtd0 ]; then
+ break
+ else
+ rmmod phram
+ fi
+ max_try=$((max_try - 1))
+ done
# Load mtdblock, the memdisk will be /dev/mtdblock0
modprobe mtdblock
fi
sleep 1
- i="$(($i + 1))"
+ i=$((i + 1))
done
fi
fi
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
- # 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
+ 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 ] && [ ! -s ${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
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
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 )
}
projects / live-boot-grml.git / blobdiff