linuxrc: unbundle is_livecd() from setup_real_root

master
Fabio Erculiani 12 years ago
parent 0cac67fa67
commit 8ab82e8b23

@ -225,21 +225,15 @@ is_aufs() {
} }
setup_real_root() { setup_real_root() {
if ! is_livecd if [ -z "${REAL_ROOT}" -a "${FAKE_ROOT}" != "/dev/ram0" ]; then
then
if [ -z "${REAL_ROOT}" -a "${FAKE_ROOT}" != "/dev/ram0" ]
then
REAL_ROOT="${FAKE_ROOT}" REAL_ROOT="${FAKE_ROOT}"
fi fi
if [ -z "${REAL_INIT}" -a "${FAKE_INIT}" != "/linuxrc" ] if [ -z "${REAL_INIT}" -a "${FAKE_INIT}" != "/linuxrc" ]; then
then
REAL_INIT="${FAKE_INIT}" REAL_INIT="${FAKE_INIT}"
fi fi
if [ -z "${REAL_ROOTFLAGS}" ] if [ -z "${REAL_ROOTFLAGS}" ]; then
then
REAL_ROOTFLAGS="${FAKE_ROOTFLAGS}" REAL_ROOTFLAGS="${FAKE_ROOTFLAGS}"
fi fi
fi
} }
findmediamount() { findmediamount() {

@ -244,7 +244,7 @@ done
quiet_kmsg quiet_kmsg
setup_real_root is_livecd || setup_real_root
zfs_init zfs_init

Loading…
Cancel
Save