Gentoo Archives: gentoo-commits

From: Rick Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/livecd-tools:master commit in: /, init.d/
Date: Thu, 26 Sep 2019 17:07:25
Message-Id: 1569516635.6eaed10f7edbfc0058ade30aa4a64707574f42a5.zerochaos@gentoo
1 commit: 6eaed10f7edbfc0058ade30aa4a64707574f42a5
2 Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 26 16:50:35 2019 +0000
4 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 26 16:50:35 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=6eaed10f
7
8 move secureconsole boot arg detection to the right place
9
10 init.d/fixinittab | 6 ------
11 livecd-functions.sh | 3 +++
12 2 files changed, 3 insertions(+), 6 deletions(-)
13
14 diff --git a/init.d/fixinittab b/init.d/fixinittab
15 index 2350100..5c893cd 100644
16 --- a/init.d/fixinittab
17 +++ b/init.d/fixinittab
18 @@ -12,12 +12,6 @@ start()
19 return 1
20 fi
21
22 - for x in ${CMDLINE} ; do
23 - case "${x}" in
24 - secureconsole) SECURECONSOLE="yes";;
25 - esac
26 - done
27 -
28 ebegin "Adjusting inittab"
29 # Create a backup
30 if [ ! -e /etc/inittab.old ]
31
32 diff --git a/livecd-functions.sh b/livecd-functions.sh
33 index ad8ee1b..899e8ab 100644
34 --- a/livecd-functions.sh
35 +++ b/livecd-functions.sh
36 @@ -135,6 +135,9 @@ livecd_read_commandline() {
37 fi
38 export LIVECD_CONSOLE
39 ;;
40 + secureconsole)
41 + export SECURECONSOLE="yes"
42 + ;;
43 esac
44 done
45 return 0