summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Farina (Zero_Chaos) <zerochaos@gentoo.org>2019-09-26 12:50:35 -0400
committerRick Farina (Zero_Chaos) <zerochaos@gentoo.org>2019-09-26 12:50:35 -0400
commit6eaed10f7edbfc0058ade30aa4a64707574f42a5 (patch)
tree5d0dcda456fe87a0bbc2a2f54d2282e18da9f15c
parentreap dead code from livecd-functions (diff)
downloadlivecd-tools-6eaed10f7edbfc0058ade30aa4a64707574f42a5.tar.gz
livecd-tools-6eaed10f7edbfc0058ade30aa4a64707574f42a5.tar.bz2
livecd-tools-6eaed10f7edbfc0058ade30aa4a64707574f42a5.zip
move secureconsole boot arg detection to the right place
-rw-r--r--init.d/fixinittab6
-rw-r--r--livecd-functions.sh3
2 files changed, 3 insertions, 6 deletions
diff --git a/init.d/fixinittab b/init.d/fixinittab
index 2350100..5c893cd 100644
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -12,12 +12,6 @@ start()
return 1
fi
- for x in ${CMDLINE} ; do
- case "${x}" in
- secureconsole) SECURECONSOLE="yes";;
- esac
- done
-
ebegin "Adjusting inittab"
# Create a backup
if [ ! -e /etc/inittab.old ]
diff --git a/livecd-functions.sh b/livecd-functions.sh
index ad8ee1b..899e8ab 100644
--- a/livecd-functions.sh
+++ b/livecd-functions.sh
@@ -135,6 +135,9 @@ livecd_read_commandline() {
fi
export LIVECD_CONSOLE
;;
+ secureconsole)
+ export SECURECONSOLE="yes"
+ ;;
esac
done
return 0