diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 941ed41..c068655 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -225,20 +225,14 @@ is_aufs() { } setup_real_root() { - if ! is_livecd - then - if [ -z "${REAL_ROOT}" -a "${FAKE_ROOT}" != "/dev/ram0" ] - then - REAL_ROOT="${FAKE_ROOT}" - fi - if [ -z "${REAL_INIT}" -a "${FAKE_INIT}" != "/linuxrc" ] - then - REAL_INIT="${FAKE_INIT}" - fi - if [ -z "${REAL_ROOTFLAGS}" ] - then - REAL_ROOTFLAGS="${FAKE_ROOTFLAGS}" - fi + if [ -z "${REAL_ROOT}" -a "${FAKE_ROOT}" != "/dev/ram0" ]; then + REAL_ROOT="${FAKE_ROOT}" + fi + if [ -z "${REAL_INIT}" -a "${FAKE_INIT}" != "/linuxrc" ]; then + REAL_INIT="${FAKE_INIT}" + fi + if [ -z "${REAL_ROOTFLAGS}" ]; then + REAL_ROOTFLAGS="${FAKE_ROOTFLAGS}" fi } diff --git a/defaults/linuxrc b/defaults/linuxrc index 7d7bb8c..282af64 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -244,7 +244,7 @@ done quiet_kmsg -setup_real_root +is_livecd || setup_real_root zfs_init