linuxrc: fix REAL_INIT setup in livecd mode

master v48
Fabio Erculiani 11 years ago
parent eefb85ffb3
commit f545918a49

@ -154,6 +154,12 @@ real_root_init() {
REAL_ROOT="${FAKE_ROOT}"
fi
if [ -z "${REAL_ROOTFLAGS}" ]; then
REAL_ROOTFLAGS="${FAKE_ROOTFLAGS}"
fi
}
real_init_init() {
local default_init="/sbin/init"
if [ -z "${REAL_INIT}" ] && [ -z "${FAKE_INIT}" ]; then
# if none of REAL_INIT and FAKE_INIT are set, default
@ -168,9 +174,6 @@ real_root_init() {
REAL_INIT="${FAKE_INIT}"
fi
fi
if [ -z "${REAL_ROOTFLAGS}" ]; then
REAL_ROOTFLAGS="${FAKE_ROOTFLAGS}"
fi
}
# Read /etc/initramfs.mounts from ${NEW_ROOT} and mount the

@ -258,6 +258,8 @@ done
quiet_kmsg
real_init_init
is_livecd || {
real_root_init && zfs_real_root_init;
}

Loading…
Cancel
Save