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
else
DNSFILE="${rootmnt}/etc/resolv.conf"
fi
- if [ -f /etc/resolv.conf ] && [ ! -s ${DNSFILE} ]
+ if [ -f /etc/resolv.conf ] && ! grep -E -q -v '^[[:space:]]*#|^[[:space:]]*$' ${DNSFILE}
then
log_begin_msg "Copying /etc/resolv.conf to ${DNSFILE}"
cp -v /etc/resolv.conf ${DNSFILE}
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 )
}