[gentoo-commits] proj/livecd-tools:master commit in: /, init.d/

[Rick Farina]

commit:     6eaed10f7edbfc0058ade30aa4a64707574f42a5
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 26 16:50:35 2019 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Sep 26 16:50:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=6eaed10f

move secureconsole boot arg detection to the right place

 init.d/fixinittab   | 6 ------
 livecd-functions.sh | 3 +++
 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