tail -f boot.log >&7 &
tailpid="${!}"
- . /live.vars
-
LIVE_BOOT_CMDLINE="${LIVE_BOOT_CMDLINE:-$(cat /proc/cmdline)}"
Cmdline_old
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_end_msg
- # unionfs-fuse needs /dev to be bind-mounted for the duration of
- # live-bottom; udev's init script will take care of things after that
- case "${UNIONTYPE}" in
- unionfs-fuse)
- mount -n -o bind /dev "${rootmnt}/dev"
- ;;
- esac
-
-
# aufs2 in kernel versions around 2.6.33 has a regression:
# directories can't be accessed when read for the first the time,
# causing a failure for example when accessing /var/lib/fai
fi
fi
- if [ -f /etc/resolv.conf ] && [ ! -s ${rootmnt}/etc/resolv.conf ]
+ 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} ]
then
- log_begin_msg "Copying /etc/resolv.conf to ${rootmnt}/etc/resolv.conf"
- cp -v /etc/resolv.conf ${rootmnt}/etc/resolv.conf
+ log_begin_msg "Copying /etc/resolv.conf to ${DNSFILE}"
+ cp -v /etc/resolv.conf ${DNSFILE}
log_end_msg
fi
Swap
- case "${UNIONFS}" in
- unionfs-fuse)
- umount "${rootmnt}/dev"
- ;;
- esac
+ Grml_Networking
exec 1>&6 6>&-
exec 2>&7 7>&-