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

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

[Matt Turner]

commit:     58948705bcf5136401621a8855e9f0c15049e1dd
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  6 00:27:40 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 00:29:07 2020 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=58948705

autoconfig: Fix logic error

When the system starts, the PID file will not exist because we haven't
started dhcpcd. Also update /var/run -> /run while we're here.

Closes: https://bugs.gentoo.org/198083
Closes: https://bugs.gentoo.org/439912
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 init.d/autoconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 15900c2..f475813 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -529,9 +529,9 @@ start() {
 		if yesno "${DHCP}"
 		then
 			einfo "DHCP broadcasting for IP on all detected interfaces ..."
-			if [ -f /var/run/dhcpcd.pid ]
+			if [ ! -f /run/dhcpcd.pid ]
 			then
-				kill $(cat /var/run/dhcpcd.pid)
+				kill $(cat /run/dhcpcd.pid)
 				sleep 2
 			fi
 			dhcpcd -n -h $(hostname)

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

[Ben Kohler]

commit:     b1798f17818d9cf4a4563a8a48d2fa4130db0a16
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 16:56:51 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 16:56:51 2024 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=b1798f17

init.d/autoconfig: allow nogui in addition to nox

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 init.d/autoconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index b30b41b..1ea3335 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -86,6 +86,9 @@ get_config() {
 			nox)
 				X11="no"
 			;;
+			nogui)
+				X11="no"
+			;;
 			acpi\=on|acpi\=force)
 				ACPI="yes"
 				APM="no"

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

[Georgy Yakovlev]

commit:     8907313e7ca1d065b9d49a29afeade02ea8a49b8
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 29 03:57:28 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Jul 29 04:04:27 2021 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=8907313e

init.d/fixinittab: auto-enable arm64 ttyAMA0 console

our sysvinit package adds the following line in /etc/inittab on arm64:

 f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100

adjust fixinittab to comment out that entry, and automatically
configure console on ttyAMA0 with proper baud rate returned by stty.

if the line is left uncommented init will spawn a reular login on that
console, that may conflict with console= option user passed.

if the user passes console=***, automatic configuration is omitted.

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 init.d/fixinittab | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/init.d/fixinittab b/init.d/fixinittab
index 5c893cd..2b43021 100644
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -23,10 +23,11 @@ start()
 	sed -i -e '/^c[0-9]/ s/^/#/' /etc/inittab
 	sed -i -e '/^s[01]/ s/^/#/' /etc/inittab
 	sed -i -e '/^b0/ s/^/#/' /etc/inittab
+	sed -i -e '/^f0/ s/^/#/' /etc/inittab
 
 	if [ -z "${LIVECD_CONSOLE}" ]
 	then
-		for c in hvc0 ttyHV0
+		for c in hvc0 ttyHV0 ttyAMA0
 		do
 			if [ -c "/dev/${c}" ]
 			then

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

[Ben Kohler]

commit:     b56c91635b59314f97184d726f93249da594731b
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 23:10:40 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 23:10:40 2021 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=b56c9163

autoconfig: mostly revert "Fix logic error"

This particular piece of logic was correct already, having been reworked
a few times since the original bug report about it.  The intent is to
kill existing an existing dhcpcd instance if the pidfile is found.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 init.d/autoconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index f475813..b30b41b 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -529,7 +529,7 @@ start() {
 		if yesno "${DHCP}"
 		then
 			einfo "DHCP broadcasting for IP on all detected interfaces ..."
-			if [ ! -f /run/dhcpcd.pid ]
+			if [ -f /run/dhcpcd.pid ]
 			then
 				kill $(cat /run/dhcpcd.pid)
 				sleep 2

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

[Matt Turner]

commit:     4bdbca1aa0a566f03721a9d3622102d5d2fab318
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  6 00:58:09 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 00:58:09 2020 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=4bdbca1a

unmute: Rewrite without awk

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 init.d/unmute | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/unmute b/init.d/unmute
index e4892a8..6c588ff 100644
--- a/init.d/unmute
+++ b/init.d/unmute
@@ -9,7 +9,7 @@ start()
 {
 	if [ -e /proc/asound/cards ]
 	then
-		for i in $(cat /proc/asound/cards | awk '{print $1}' | grep ^[[:digit:]])
+		for i in $(grep -o '^\s\?[0-9]\+' /proc/asound/cards)
 		do
 			ebegin "Unmuting sound card $i"
 			if [ -d /proc/asound/card$i ] && [ -x /usr/bin/amixer ]

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

[Matt Turner]

commit:     62ef870732d99d99b987fc34964a023d3711824c
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  5 03:15:14 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Nov  5 23:28:48 2020 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=62ef8707

remove hwsetup usage

it requires beyond ancient libkudzu and mostly obsoleted by udev.
also libkudzu no longer builds on stable glibc-2.32 (bug 713946)

Bug: https://bugs.gentoo.org/408535
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> gmail.com>

 init.d/autoconfig | 24 ++----------------------
 init.d/hwsetup    | 11 -----------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index f541a0c..1dbfc5a 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -228,10 +228,6 @@ list_services() {
 	svcs="${svcs} $(check_svc ${APM} apmd)"
 	svcs="${svcs} $(check_svc ${BRLTTY} brltty)"
 	svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)"
-	if yesno "$COLDPLUG" && ! rc-service -e coldplug && ! rc-service -e hotplug
-	then
-		echo hwsetup
-	fi
 	svcs="${svcs} $(check_svc ${GPM} gpm)"
 	svcs="${svcs} $(check_svc ${IDEDMA} hdparm)"
 	svcs="${svcs} $(check_svc ${NFS} nfsclient)"
@@ -518,9 +514,6 @@ start() {
 		ewarn "Skipping DHCP broadcast ..."
 	fi
 
-	# Read in what hwsetup has found
-	[ -f /etc/sysconfig/gentoo ] && source /etc/sysconfig/gentoo
-
 	if yesno "${DETECT}"
 	then
 		NETDEVICES="$(detect_netdevices)"
@@ -559,24 +552,11 @@ start() {
 		ewarn "No Network device auto detected ..."
 	fi
 
-	if yesno "${ALSA}"
+	if ! yesno "${ALSA}"
 	then
-		if [ -n "${SOUND_FULLNAME}" -o -n "${SOUND_DRIVER}" ]
-		then
-			einfo "Soundcard:  "
-
-			[ -n "${SOUND_FULLNAME}" ] \
-				&& einfo "              ${WARN}${SOUND_FULLNAME}  "
-			[ -n "${SOUND_DRIVER}" ] \
-				&& einfo "              driver = ${SOUND_DRIVER}"
-		fi
-	else
-		ewarn "Skipping ALSA detection as requested on command line ..."
+		ewarn "Skipping ALSA services as requested on command line ..."
 	fi
 
-	[ -n "${XDESC}" ] && einfo "VideoCard:   ${HILITE}${XDESC}${NORMAL}"
-
-	killall hwsetup 2>/dev/null
 	echo "6" > /proc/sys/kernel/printk
 
 	if ! yesno "${X11}"

diff --git a/init.d/hwsetup b/init.d/hwsetup
deleted file mode 100644
index 16ee967..0000000
--- a/init.d/hwsetup
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-start() {
-	ebegin "Starting hwsetup"
-	[ -e /etc/sysconfig ] || mkdir -p /etc/sysconfig
-	[ -x /usr/sbin/hwsetup ] && hwsetup
-	eend $?
-}

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

[Matt Turner]

commit:     d3ef3b3d67a6bea6001029ecde452a022da4ffeb
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  5 03:29:16 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Nov  5 23:29:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=d3ef3b3d

autoconfig: don't autostart gpm if /dev/input/mice is not present

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> gmail.com>

 init.d/autoconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 1dbfc5a..15900c2 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -228,7 +228,10 @@ list_services() {
 	svcs="${svcs} $(check_svc ${APM} apmd)"
 	svcs="${svcs} $(check_svc ${BRLTTY} brltty)"
 	svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)"
-	svcs="${svcs} $(check_svc ${GPM} gpm)"
+	if [ -c /dev/input/mice ]
+	then
+		svcs="${svcs} $(check_svc ${GPM} gpm)"
+	fi
 	svcs="${svcs} $(check_svc ${IDEDMA} hdparm)"
 	svcs="${svcs} $(check_svc ${NFS} nfsclient)"
 	svcs="${svcs} $(check_svc ${PASSWD} pwgen)"

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

[Matt Turner]

commit:     15d17333c8e7e5ef038ea288ccc98522c51f4fba
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  5 03:15:13 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Nov  5 23:28:34 2020 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=15d17333

remove special mouse handling and pre-gpm script

nowadays mice are available via /dev/input/mice, which
gpm defaults to open at startup.

 INPUT_MOUSEDEV description:
   Say Y here if you want your mouse to be accessible as char devices
   13:32+ - /dev/input/mouseX and 13:63 - /dev/input/mice as an emulated
   IntelliMouse Explorer PS/2 mouse. That way, all user space programs
   (including SVGAlib, GPM and X) will be able to use your mouse.

The data available through /dev/psaux is exactly the same as the data
from /dev/input/mice.

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> gmail.com>

 init.d/autoconfig |  9 ---------
 init.d/gpm-pre    | 33 ---------------------------------
 2 files changed, 42 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 9bc3a38..f541a0c 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -232,7 +232,6 @@ list_services() {
 	then
 		echo hwsetup
 	fi
-	svcs="${svcs} $(check_svc ${GPM} gpm-pre)"
 	svcs="${svcs} $(check_svc ${GPM} gpm)"
 	svcs="${svcs} $(check_svc ${IDEDMA} hdparm)"
 	svcs="${svcs} $(check_svc ${NFS} nfsclient)"
@@ -522,14 +521,6 @@ start() {
 	# Read in what hwsetup has found
 	[ -f /etc/sysconfig/gentoo ] && source /etc/sysconfig/gentoo
 
-	# Mouse
-	# FIXME: If MOUSE_DEVICE is empty, we actually do not want to do anything, not even start gpm.
-	if [ -n "${MOUSE_DEVICE}" ]
-	then
-		:
-		# Migrated to autoconfig-gpm-pre
-	fi
-
 	if yesno "${DETECT}"
 	then
 		NETDEVICES="$(detect_netdevices)"

diff --git a/init.d/gpm-pre b/init.d/gpm-pre
deleted file mode 100644
index a03e881..0000000
--- a/init.d/gpm-pre
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-depend() {
-	before gpm
-	need hwsetup
-}
-
-start() {
-	[ -f /etc/sysconfig/gentoo ] && source /etc/sysconfig/gentoo
-	[ -f /etc/sysconfig/mouse ] && source /etc/sysconfig/mouse
-	if [ -z "${MOUSE_DEVICE}" ]; then
-		ewarn "No mouse detected. GPM will not be started."
-		return 0
-	fi
-	einfo "Mouse is ${HILITE}${MOUSE_FULLNAME}${NORMAL} at ${HILITE}${MOUSE_DEVICE}${NORMAL} ..."
-
-	if [ $(grep "#MOUSE=${MOUSETYPE}" /etc/conf.d/gpm) ]; then
-		sed -i "\@MOUSE=${MOUSETYPE}@s@^#@@" /etc/conf.d/gpm
-	else
-		echo "MOUSE=${MOUSETYPE}" >>/etc/conf.d/gpm
-	fi
-
-	if [ $(grep "#MOUSEDEV=${DEVICE}" /etc/conf.d/gpm) ]; then
-		sed -i "\@MOUSEDEV=${DEVICE}@s@^#@@" /etc/conf.d/gpm
-	else
-		echo "MOUSEDEV=${DEVICE}" >>/etc/conf.d/gpm
-	fi
-}
-
-# vim: ft=gentoo-init-d:

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

[Rick Farina]

commit:     55897d049a5a479028783def544fd616cbc53427
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 18:08:16 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 18:08:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=55897d04

save a grep and a count

coreutils has a whole utility just to tell you the cpu count, use it

Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>

 init.d/autoconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index fd68011..9bc3a38 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -393,7 +393,7 @@ start() {
 	echo "0" > /proc/sys/kernel/printk
 	get_config
 
-	local numcpu="$(grep -c '^processor[[:space:]]\+:' /proc/cpuinfo)"
+	local numcpu="$(nproc)"
 	eindent
 	ebegin "Setting sane defaults in /etc/portage/make.conf"
 	if [ -f "/etc/portage/make.conf" ] && checkpath -W /etc/portage/make.conf; then

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

[Matt Turner]

commit:     6f0afe2a70bf7d8c5a9ef1e1e3fe3e83b6aece2b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 17:20:21 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 17:20:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=6f0afe2a

fixinittab: Support SPARC's ttyHV0 console device

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 init.d/fixinittab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/fixinittab b/init.d/fixinittab
index b0fcaeb..2350100 100644
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -32,7 +32,7 @@ start()
 
 	if [ -z "${LIVECD_CONSOLE}" ]
 	then
-		for c in hvc0
+		for c in hvc0 ttyHV0
 		do
 			if [ -c "/dev/${c}" ]
 			then

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

[Matt Turner]

commit:     3c23b30aed805fb5f6b148f273c0c139eac8f6f3
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 17:18:18 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 17:19:37 2019 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=3c23b30a

fixinittab: Refactor HW-specific serial console support

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 init.d/fixinittab | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/init.d/fixinittab b/init.d/fixinittab
index 4491217..b0fcaeb 100644
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -30,6 +30,25 @@ start()
 	sed -i -e '/^s[01]/ s/^/#/' /etc/inittab
 	sed -i -e '/^b0/ s/^/#/' /etc/inittab
 
+	if [ -z "${LIVECD_CONSOLE}" ]
+	then
+		for c in hvc0
+		do
+			if [ -c "/dev/${c}" ]
+			then
+				LIVECD_CONSOLE_BAUD=$(stty -F "/dev/${c}" speed)
+
+				eindent
+				ebegin "Adding ${c} console to inittab ..."
+				echo "s0:12345:respawn:/sbin/agetty -a root ${LIVECD_CONSOLE_BAUD} ${c}" >> /etc/inittab
+				eend $?
+				eoutdent
+
+				break
+			fi
+		done
+	fi
+
 	# SPARC & HPPA console magic
 	if [ "${HOSTTYPE}" = "sparc" -o "${HOSTTYPE}" = "hppa" ]
 	then
@@ -94,15 +113,6 @@ start()
 		fi
 	fi
 
-	if [ -c "/dev/hvc0" -a "${LIVECD_CONSOLE}" = "" ]
-	then
-		eindent
-		ebegin "Adding hvc console to inittab ..."
-		echo "s0:12345:respawn:/sbin/agetty -a root 9600 hvc0 vt320" >> /etc/inittab
-		eend $?
-		eoutdent
-	fi
-
 	# EFI-based machines should automatically hook up their console lines
 	if dmesg | grep -q '^Adding console on'
 	then

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

[Matt Turner]

commit:     098ff810778e35116ccc2ee37cf8912c3cb486c7
Author:     Luca Barbato <lu_zero <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 07:36:49 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 05:26:45 2018 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=098ff810

ppc: Move the hvc0 console logic outside

Make so also ppc64le is supported and allow to override its
configuration by specifying another console as kernel param.

 init.d/fixinittab | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/init.d/fixinittab b/init.d/fixinittab
index de3a12f..4491217 100644
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -31,7 +31,7 @@ start()
 	sed -i -e '/^b0/ s/^/#/' /etc/inittab
 
 	# SPARC & HPPA console magic
-	if [ "${HOSTTYPE}" = "sparc" -o "${HOSTTYPE}" = "hppa" -o "${HOSTTYPE}" = "ppc64" ]
+	if [ "${HOSTTYPE}" = "sparc" -o "${HOSTTYPE}" = "hppa" ]
 	then
 		# Mount openprom tree for user debugging purposes
 		if [ "${HOSTTYPE}" = "sparc" ]
@@ -69,15 +69,6 @@ start()
 			    done
 			fi
 		fi
-		if [ -c "/dev/hvc0" ]
-		then
-			eindent
-			ebegin "Adding hvc console to inittab ..."
-			echo "s0:12345:respawn:/sbin/agetty -a root 9600 hvc0 vt320" >> /etc/inittab
-			eend $?
-			eoutdent
-		fi
-
 	# The rest...
 	else
 		if [ "${LIVECD_CONSOLE}" = "tty0" -o "${LIVECD_CONSOLE}" = "" ]
@@ -103,6 +94,15 @@ start()
 		fi
 	fi
 
+	if [ -c "/dev/hvc0" -a "${LIVECD_CONSOLE}" = "" ]
+	then
+		eindent
+		ebegin "Adding hvc console to inittab ..."
+		echo "s0:12345:respawn:/sbin/agetty -a root 9600 hvc0 vt320" >> /etc/inittab
+		eend $?
+		eoutdent
+	fi
+
 	# EFI-based machines should automatically hook up their console lines
 	if dmesg | grep -q '^Adding console on'
 	then

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

[Richard Farina]

commit:     82eab2c4e4cb5ab7d9fb9a560377f2472cadae2d
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 24 14:54:37 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 14:55:53 2018 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=82eab2c4

remove redundant agetty settings

agetty baud rate doesn't matter on linux vt and is ignored per manual
agetty term type is default set to linux on vt per manual

thanks to grknight for pointing it out

 init.d/fixinittab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/fixinittab b/init.d/fixinittab
index 7123cc0..de3a12f 100644
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -86,7 +86,7 @@ start()
 				echo "c1:12345:respawn:/sbin/mingetty --noclear --autologin $(id -nu 1000 2>/dev/null || echo root) tty1" >> /etc/inittab
 				for x in 2 3 4 5 6
 				do
-					echo "c${x}:2345:respawn:/sbin/agetty 38400 tty${x} linux" >> /etc/inittab
+					echo "c${x}:2345:respawn:/sbin/agetty tty${x}" >> /etc/inittab
 				done
 			else
 				for x in 1 2 3 4 5 6

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

[Richard Farina]

commit:     8153df03e15624ba4319d2fc9b1fd1fefb47cd86
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 01:06:36 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 01:06:36 2018 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=8153df03

fix typos, reenable remaining vt (no autologin)

 init.d/fixinittab | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/init.d/fixinittab b/init.d/fixinittab
index d675b9b..7123cc0 100644
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -83,7 +83,11 @@ start()
 		if [ "${LIVECD_CONSOLE}" = "tty0" -o "${LIVECD_CONSOLE}" = "" ]
 		then
 			if [ "${SECURECONSOLE}" = "yes" ]; then
-				echo "c1:12345:respawn:/sbin/mingetty --noclear --autologin $(id -nu 1000 2>/dev/null || echo root) tty${x}" >> /etc/inittab
+				echo "c1:12345:respawn:/sbin/mingetty --noclear --autologin $(id -nu 1000 2>/dev/null || echo root) tty1" >> /etc/inittab
+				for x in 2 3 4 5 6
+				do
+					echo "c${x}:2345:respawn:/sbin/agetty 38400 tty${x} linux" >> /etc/inittab
+				done
 			else
 				for x in 1 2 3 4 5 6
 				do

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

[Richard Farina]

commit:     4afe3e67f65cd7e1cf910b02c25fb0bb6dbc0a1a
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 18:49:04 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 18:49:04 2018 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=4afe3e67

add some comments when writing make.conf

decrease ambiguity with some comments

 init.d/autoconfig | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 848a102..fd68011 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -382,6 +382,12 @@ detect_netdevices() {
 	return 0
 }
 
+write_emerge_default_opts() {
+	printf "\n# EMERGE_DEFAULT_OPTS is set automatically by livecd-tools autoconfig during first live boot.\n" >> $1
+	printf "# This should be equal to number of processors, see \"man emerge\" for details.\n" >> $1
+	printf "EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} --jobs=${numcpu} --load-average=${numcpu}\"\n" >> $1
+}
+
 start() {
 	ebegin "Starting autoconfig"
 	echo "0" > /proc/sys/kernel/printk
@@ -392,13 +398,13 @@ start() {
 	ebegin "Setting sane defaults in /etc/portage/make.conf"
 	if [ -f "/etc/portage/make.conf" ] && checkpath -W /etc/portage/make.conf; then
 		if ! grep -q 'EMERGE_DEFAULT_OPTS=.*--jobs' /etc/portage/make.conf; then
-			printf "EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} --jobs=${numcpu} --load-average=${numcpu}\"\n" >> /etc/portage/make.conf
+			write_emerge_default_opts /etc/portage/make.conf
 		fi
 	elif [ ! -f "/etc/portage/make.conf" ] && [ ! -d "/etc/portage/make.conf" ] && checkpath -W /etc/portage; then
-		printf "EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} --jobs=${numcpu} --load-average=${numcpu}\"\n" >> /etc/portage/make.conf
+		write_emerge_default_opts /etc/portage/make.conf
 	elif [ -d "/etc/portage/make.conf" ]; then
 		if [ ! -f "/etc/portage/make.conf/livecd-tools-autoconfig" ] && checkpath -W /etc/portage/make.conf/livecd-tools-autoconfig; then
-			printf "EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} --jobs=${numcpu} --load-average=${numcpu}\"\n" >> /etc/portage/make.conf/livecd-tools-autoconfig
+			write_emerge_default_opts /etc/portage/make.conf/livecd-tools-autoconfig
 		fi
 	else
 		false

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

[Richard Farina]

commit:     3eca4027c0ed5aa526cbe94a92c0f0ddff8d186a
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 17:06:32 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 17:06:32 2018 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=3eca4027

add secureconsole boot option

don't log in every console if the user requests secureconsole

 init.d/fixinittab | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/init.d/fixinittab b/init.d/fixinittab
index de9ca06..d675b9b 100644
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -12,6 +12,12 @@ 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 ]
@@ -76,10 +82,14 @@ start()
 	else
 		if [ "${LIVECD_CONSOLE}" = "tty0" -o "${LIVECD_CONSOLE}" = "" ]
 		then
-			for x in 1 2 3 4 5 6
-			do
-				echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin $(id -nu 1000 2>/dev/null || echo root) tty${x}" >> /etc/inittab
-			done
+			if [ "${SECURECONSOLE}" = "yes" ]; then
+				echo "c1:12345:respawn:/sbin/mingetty --noclear --autologin $(id -nu 1000 2>/dev/null || echo root) tty${x}" >> /etc/inittab
+			else
+				for x in 1 2 3 4 5 6
+				do
+					echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin $(id -nu 1000 2>/dev/null || echo root) tty${x}" >> /etc/inittab
+				done
+			fi
 		else
 			eindent
 			ebegin "Adding ${LIVECD_CONSOLE} console to inittab"

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

[William Hubbs]

commit:     f672cb58a56638c9df5695015742aa3b2c37f2e8
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Mar 15 04:30:30 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 04:33:30 2018 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=f672cb58

autoconfig: fix the indentation

 init.d/autoconfig | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 715350e..848a102 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -386,22 +386,23 @@ start() {
 	ebegin "Starting autoconfig"
 	echo "0" > /proc/sys/kernel/printk
 	get_config
+
 	local numcpu="$(grep -c '^processor[[:space:]]\+:' /proc/cpuinfo)"
 	eindent
 	ebegin "Setting sane defaults in /etc/portage/make.conf"
-		if [ -f "/etc/portage/make.conf" ] && checkpath -W /etc/portage/make.conf; then
-			if ! grep -q 'EMERGE_DEFAULT_OPTS=.*--jobs' /etc/portage/make.conf; then
-				printf "EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} --jobs=${numcpu} --load-average=${numcpu}\"\n" >> /etc/portage/make.conf
-			fi
-		elif [ ! -f "/etc/portage/make.conf" ] && [ ! -d "/etc/portage/make.conf" ] && checkpath -W /etc/portage; then
+	if [ -f "/etc/portage/make.conf" ] && checkpath -W /etc/portage/make.conf; then
+		if ! grep -q 'EMERGE_DEFAULT_OPTS=.*--jobs' /etc/portage/make.conf; then
 			printf "EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} --jobs=${numcpu} --load-average=${numcpu}\"\n" >> /etc/portage/make.conf
-		elif [ -d "/etc/portage/make.conf" ]; then
-			if [ ! -f "/etc/portage/make.conf/livecd-tools-autoconfig" ] && checkpath -W /etc/portage/make.conf/livecd-tools-autoconfig; then
-				printf "EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} --jobs=${numcpu} --load-average=${numcpu}\"\n" >> /etc/portage/make.conf/livecd-tools-autoconfig
-			fi
-		else
-			false
 		fi
+	elif [ ! -f "/etc/portage/make.conf" ] && [ ! -d "/etc/portage/make.conf" ] && checkpath -W /etc/portage; then
+		printf "EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} --jobs=${numcpu} --load-average=${numcpu}\"\n" >> /etc/portage/make.conf
+	elif [ -d "/etc/portage/make.conf" ]; then
+		if [ ! -f "/etc/portage/make.conf/livecd-tools-autoconfig" ] && checkpath -W /etc/portage/make.conf/livecd-tools-autoconfig; then
+			printf "EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} --jobs=${numcpu} --load-average=${numcpu}\"\n" >> /etc/portage/make.conf/livecd-tools-autoconfig
+		fi
+	else
+		false
+	fi
 	eend $? "Unable to write to /etc/portage/make.conf"
 	eoutdent
 

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

[Richard Farina]

commit:     30c14caa2b383d7ce5a41019c01fbb77a6e04c17
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 03:50:04 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 03:50:04 2018 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=30c14caa

update make.conf with some nice defaults for emerge

just for fun, try to sane up the EMERGE_DEFAULT_OPTS for livecd users

 init.d/autoconfig | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 71e1deb..715350e 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -179,8 +179,8 @@ check_svc() {
 		elif [ -n "${3}" ] && rc-service -e "${3}"
 		then
 			echo "${3}"
-		fi	
-	fi	
+		fi
+	fi
 }
 
 # Prints an ordered list of services that will be started by autoconfig.
@@ -386,12 +386,29 @@ start() {
 	ebegin "Starting autoconfig"
 	echo "0" > /proc/sys/kernel/printk
 	get_config
+	local numcpu="$(grep -c '^processor[[:space:]]\+:' /proc/cpuinfo)"
+	eindent
+	ebegin "Setting sane defaults in /etc/portage/make.conf"
+		if [ -f "/etc/portage/make.conf" ] && checkpath -W /etc/portage/make.conf; then
+			if ! grep -q 'EMERGE_DEFAULT_OPTS=.*--jobs' /etc/portage/make.conf; then
+				printf "EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} --jobs=${numcpu} --load-average=${numcpu}\"\n" >> /etc/portage/make.conf
+			fi
+		elif [ ! -f "/etc/portage/make.conf" ] && [ ! -d "/etc/portage/make.conf" ] && checkpath -W /etc/portage; then
+			printf "EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} --jobs=${numcpu} --load-average=${numcpu}\"\n" >> /etc/portage/make.conf
+		elif [ -d "/etc/portage/make.conf" ]; then
+			if [ ! -f "/etc/portage/make.conf/livecd-tools-autoconfig" ] && checkpath -W /etc/portage/make.conf/livecd-tools-autoconfig; then
+				printf "EMERGE_DEFAULT_OPTS=\"\${EMERGE_DEFAULT_OPTS} --jobs=${numcpu} --load-average=${numcpu}\"\n" >> /etc/portage/make.conf/livecd-tools-autoconfig
+			fi
+		else
+			false
+		fi
+	eend $? "Unable to write to /etc/portage/make.conf"
+	eoutdent
 
 	if yesno "${DETECT}"
 	then
 		eindent
 		ebegin "Hardware detection started"
-			local numcpu="$(grep -c '^processor[[:space:]]\+:' /proc/cpuinfo)"
 			local arch="$(uname -m)"
 
 			case ${arch} in

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

[Richard Farina]

commit:     a4781f1f7cd1c5cfacfb073628a9d3bc4c0c8e99
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 18:36:33 2017 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 18:36:33 2017 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=a4781f1f

log in as user when possible

catalyst can create a user, if the cd is built like that it wasn't an
accident, use that user to log in instead of root

 init.d/fixinittab | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/init.d/fixinittab b/init.d/fixinittab
index 35513a6..de9ca06 100644
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -54,12 +54,12 @@ start()
 			then
 			    for x in 0 1 2 3 4 5 6
 			    do
-				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
+				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin $(id -nu 1000 2>/dev/null || echo root) tty${x}" >> /etc/inittab
 			    done
 			else
 			    for x in 1 2 3 4 5 6
 			    do
-				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
+				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin $(id -nu 1000 2>/dev/null || echo root) tty${x}" >> /etc/inittab
 			    done
 			fi
 		fi
@@ -78,7 +78,7 @@ start()
 		then
 			for x in 1 2 3 4 5 6
 			do
-				echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
+				echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin $(id -nu 1000 2>/dev/null || echo root) tty${x}" >> /etc/inittab
 			done
 		else
 			eindent

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

[Robin H. Johnson]

commit:     35e6ad46825721dff195ad743277af5f9bd989e1
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 00:46:45 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 00:46:52 2017 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=35e6ad46

autoconfig: protect password in /proc/cmdline.

If passing a root password in /proc/cmdline, we should protect
/proc/cmdline from non-root users.

If root mounts a NEW /proc fileystem, this will be exposed again, but
that's out of our control.

The kernel boot parameter hidepid= only affects /proc/$PID/cmdline, so
cannot be used in this case.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=610840
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 init.d/autoconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 5991fef..76d6086 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -534,6 +534,7 @@ start() {
 		fi
 		if ! yesno "${PASSWD}"
 		then
+			chmod og-r /proc/cmdline # Try to secure the kernel parameters per bug #610840
 			echo "root:${PASSWORD}" | chpasswd  > /dev/null 2>&1
 		fi
 		if yesno "${SSHD}"

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

[William Hubbs]

commit:     52ec5a675d63a066dbfb62a0f7a07ee22a31e28a
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Jul  9 04:27:07 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 04:27:07 2016 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=52ec5a67

convert shebangs from runscript to openrc-run

 init.d/autoconfig | 2 +-
 init.d/fixinittab | 2 +-
 init.d/gpm-pre    | 2 +-
 init.d/hwsetup    | 2 +-
 init.d/unmute     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index de73b27..5991fef 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 
 # This script is used by Gentoo release media to start certain services and to
 # ensure a sane setup for a CD-based boot.

diff --git a/init.d/fixinittab b/init.d/fixinittab
index 56bfbcc..35513a6 100644
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 
 depend()
 {

diff --git a/init.d/gpm-pre b/init.d/gpm-pre
index ef97e38..a03e881 100644
--- a/init.d/gpm-pre
+++ b/init.d/gpm-pre
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $

diff --git a/init.d/hwsetup b/init.d/hwsetup
index 35cfdae..16ee967 100644
--- a/init.d/hwsetup
+++ b/init.d/hwsetup
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $

diff --git a/init.d/unmute b/init.d/unmute
index 4ce6db9..e4892a8 100644
--- a/init.d/unmute
+++ b/init.d/unmute
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 
 depend()
 {

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

[William Hubbs]

commit:     c1128645a2ae777f37d83477d2bccfd310e4d7c9
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  8 04:35:36 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 17:31:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=c1128645

Allow nfs to be activated from the kernel command line

 init.d/autoconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 0e5d769..7b31b88 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -132,6 +132,9 @@ get_config() {
 			donet)
 				NET="yes"
 			;;
+			donfs)
+				NFS="yes"
+			;;
 			dopata)
 				PATA="yes"
 			;;

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

[William Hubbs]

commit:     78b624a34932581f19aa76f197aabc45b056014d
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  8 04:36:35 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 17:49:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=78b624a3

Replace nfsmount with nfsclient

nfsmount is deprecated and partially replaced by nfsclient...but should we
also add netmount?

 init.d/autoconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 7b31b88..de73b27 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -242,7 +242,7 @@ list_services() {
 	svcs="${svcs} $(check_svc ${GPM} gpm-pre)"
 	svcs="${svcs} $(check_svc ${GPM} gpm)"
 	svcs="${svcs} $(check_svc ${IDEDMA} hdparm)"
-	svcs="${svcs} $(check_svc ${NFS} nfsmount)"
+	svcs="${svcs} $(check_svc ${NFS} nfsclient)"
 	svcs="${svcs} $(check_svc ${PASSWD} pwgen)"
 	svcs="${svcs} $(check_svc ${PCMCIA} pcmcia)"
 	svcs="${svcs} $(check_svc ${SSHD} sshd)"

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

[Richard Farina]

commit:     259febe31230205b65045e3436a348e0c61dba82
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  1 20:44:21 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sun Nov  1 20:44:21 2015 +0000
URL:        https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=259febe3

no more arrays in conf.d/net

 init.d/autoconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 59eb64c..0e5d769 100644
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -494,7 +494,7 @@ start() {
 			/etc/conf.d/net
 		for i in `seq 0 4`
 		do
-			echo "config_eth${i}=( \"none\" )" >> /etc/conf.d/net
+			echo "config_eth${i}=\"null\"" >> /etc/conf.d/net
 		done
 		ewarn "Skipping DHCP broadcast ..."
 	fi

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

[Richard Farina]

commit:     c692089f622e4f89d62987215e8a32cccf54aa8a
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu May 22 16:29:08 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu May 22 16:29:08 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=c692089f

remove firmware init script

The tarballing and subsequent unpacking of the firmware has been a
source of issues which are being eliminated. Bugs 511040, 498986, plus
probably some more.

---
 init.d/autoconfig |  2 +-
 init.d/firmware   | 25 -------------------------
 init.d/hwsetup    |  4 ----
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 10a60b7..59eb64c 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -234,7 +234,7 @@ list_services() {
 	svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)"
 	if yesno "$COLDPLUG" && ! rc-service -e coldplug && ! rc-service -e hotplug
 	then
-		echo firmware hwsetup
+		echo hwsetup
 	fi
 	svcs="${svcs} $(check_svc ${GPM} gpm-pre)"
 	svcs="${svcs} $(check_svc ${GPM} gpm)"

diff --git a/init.d/firmware b/init.d/firmware
deleted file mode 100755
index c5534b9..0000000
--- a/init.d/firmware
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# This unpacks any firmware tarballs.
-
-depend() {
-	:
-}
-
-start() {
-	ebegin "Checking for firmware to unpack"
-	if [ -e /lib/firmware.tar.bz2 ]
-	then
-		eindent
-		ebegin "Unpacking firmware"
-		mkdir -p /lib/firmware
-		tar xjf /lib/firmware.tar.bz2 -C /lib/firmware
-		eend 0
-		eoutdent
-	fi
-	[ -x /sbin/udevadm ] && /sbin/udevadm trigger
-	eend $?
-}

diff --git a/init.d/hwsetup b/init.d/hwsetup
index a13e3be..35cfdae 100755
--- a/init.d/hwsetup
+++ b/init.d/hwsetup
@@ -3,10 +3,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-depend() {
-	need firmware
-}
-
 start() {
 	ebegin "Starting hwsetup"
 	[ -e /etc/sysconfig ] || mkdir -p /etc/sysconfig

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

[William Hubbs]

commit:     793efb2eef4ea146b6e0db90f11e03fd193246be
Author:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  5 21:53:22 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jul  5 21:54:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=793efb2e

fixinittab: Do not overwrite an existing backup

---
 init.d/fixinittab | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/init.d/fixinittab b/init.d/fixinittab
index c485637..56bfbcc 100755
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -14,7 +14,10 @@ start()
 
 	ebegin "Adjusting inittab"
 	# Create a backup
-	cp -f /etc/inittab /etc/inittab.old
+	if [ ! -e /etc/inittab.old ]
+	then
+		cp -f /etc/inittab /etc/inittab.old
+	fi
 
 	# Comment out current getty settings
 	sed -i -e '/^c[0-9]/ s/^/#/' /etc/inittab

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

[William Hubbs]

commit:     104e9c65b1e1aadcb375debaa259589702fc08f3
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 19 15:07:55 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jun 19 15:17:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=104e9c65

autoconfig: update network device name recognission

The previous code assumed the old style network names such as eth* were
the names of interfaces. With the new udev, this is not always the case,
so this updates autoconfig to ignore lo and sit0 and assume that the
rest are valid network interfaces. Also we now use /sys/class/net/* to
detect interfaces instead of /proc/dev/net.

Reported-by: alexeyk13 <AT> yandex.ru
X-Gentoo-Bug: 471054
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=471054

---
 init.d/autoconfig | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 8f5c5db..10a60b7 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -375,6 +375,17 @@ detect_sparc() {
 	PC="Detected ${numcpu} active ${cpuinfo} CPU(s) of ${numprobed} total"
 }
 
+detect_netdevices() {
+	for dev in /sys/class/net/*; do
+		n="$(basename $dev)"
+		case "$n" in
+		lo|sit0) continue ;;
+		*) echo $n
+		esac
+	done
+	return 0
+}
+
 start() {
 	ebegin "Starting autoconfig"
 	echo "0" > /proc/sys/kernel/printk
@@ -501,7 +512,7 @@ start() {
 
 	if yesno "${DETECT}"
 	then
-		NETDEVICES="$(awk -F: '/eth.:|tr.:|ath.:|wlan.:/{print $1}' /proc/net/dev 2>/dev/null)"
+		NETDEVICES="$(detect_netdevices)"
 	else
 		DHCP="no"
 	fi

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

[William Hubbs]

commit:     048afdb1528b00ec503a977d5a818edfe91ae571
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  3 17:47:33 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jan  3 18:16:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=048afdb1

autoconfig: run one instance of dhcpcd

One instance of dhcpcd in standalone mode can control all detected
interfaces. This should automatically get an address for any network
where there is an active dhcp server.

This will also fix bug #439912.

---
 init.d/autoconfig |   22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 7511366..8f5c5db 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -508,22 +508,16 @@ start() {
 
 	if [ -n "${NETDEVICES}" ]
 	then
-		for nics in ${NETDEVICES}
-		do
-			if yesno "${DHCP}"
+		if yesno "${DHCP}"
+		then
+			einfo "DHCP broadcasting for IP on all detected interfaces ..."
+			if [ -f /var/run/dhcpcd.pid ]
 			then
-				einfo "Network device ${HILITE}${nics}${NORMAL} detected, DHCP broadcasting for IP ..."
-				if [ -f /var/run/dhcpcd-${nics}.pid ]
-				then
-					if [ -z "$(/sbin/ifconfig ${nics} | grep 'inet addr')" ]
-					then
-						kill $(cat /var/run/dhcpcd-${nics}.pid)
-						sleep 2
-						dhcpcd -n -h $(hostname) ${nics}
-					fi
-				fi
+				kill $(cat /var/run/dhcpcd.pid)
+				sleep 2
 			fi
-		done
+			dhcpcd -n -h $(hostname)
+		fi
 		if ! yesno "${PASSWD}"
 		then
 			echo "root:${PASSWORD}" | chpasswd  > /dev/null 2>&1

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

[William Hubbs]

commit:     476fe7f59765f889d010c507f1142d48b724d60b
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  3 14:09:48 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Oct  3 14:09:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=476fe7f5

gpm-pre: fix sourcing of hwsetup settings

Source the files only if they exist. Also, warn if a mouse was not
detected. The gpm init script already detects if a mouse isn't
configured and refuses to start, which is what we want.

X-Gentoo-Bug: 408533
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=408533

---
 init.d/gpm-pre |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/init.d/gpm-pre b/init.d/gpm-pre
index f44e5c2..ef97e38 100755
--- a/init.d/gpm-pre
+++ b/init.d/gpm-pre
@@ -9,10 +9,12 @@ depend() {
 }
 
 start() {
-	# FIXME: If MOUSE_DEVICE is empty, we actually do not want to do anything, not even start gpm.
-	# created by hwsetup
-	source /etc/sysconfig/gentoo
-	source /etc/sysconfig/mouse
+	[ -f /etc/sysconfig/gentoo ] && source /etc/sysconfig/gentoo
+	[ -f /etc/sysconfig/mouse ] && source /etc/sysconfig/mouse
+	if [ -z "${MOUSE_DEVICE}" ]; then
+		ewarn "No mouse detected. GPM will not be started."
+		return 0
+	fi
 	einfo "Mouse is ${HILITE}${MOUSE_FULLNAME}${NORMAL} at ${HILITE}${MOUSE_DEVICE}${NORMAL} ..."
 
 	if [ $(grep "#MOUSE=${MOUSETYPE}" /etc/conf.d/gpm) ]; then

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

[William Hubbs]

commit:     0e5d3bfc530c4c6607e0f04ab7f24770070b9cc7
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 02:04:23 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 02:34:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=0e5d3bfc

further cosmetic cleanups

There were several einfo calls which ended with "...". These have been converted
to ebegins and appropriate eend, eindent and eoutdent calls were
inserted.

X-Gentoo-Bug: 388401
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=388401

---
 init.d/autoconfig |    5 ++++-
 init.d/firmware   |    7 +++++--
 init.d/fixinittab |   13 +++++++++----
 init.d/hwsetup    |    3 ++-
 init.d/unmute     |    3 ++-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 056ff85..7511366 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -376,12 +376,13 @@ detect_sparc() {
 }
 
 start() {
-	einfo "Starting autoconfig ..."
+	ebegin "Starting autoconfig"
 	echo "0" > /proc/sys/kernel/printk
 	get_config
 
 	if yesno "${DETECT}"
 	then
+		eindent
 		ebegin "Hardware detection started"
 			local numcpu="$(grep -c '^processor[[:space:]]\+:' /proc/cpuinfo)"
 			local arch="$(uname -m)"
@@ -421,6 +422,7 @@ start() {
 			esac
 			[ -n "${PC}" ] && einfo "${PC}"
 		eend
+		eoutdent
 	else
 		ewarn "Hardware detection disabled via cmdline ..."
 	fi
@@ -567,6 +569,7 @@ start() {
 		reset
 		chvt 1
 	fi
+	eend $?
 }
 
 # vim: ts=4

diff --git a/init.d/firmware b/init.d/firmware
index 30d07c9..c5534b9 100755
--- a/init.d/firmware
+++ b/init.d/firmware
@@ -10,13 +10,16 @@ depend() {
 }
 
 start() {
-einfo "Checking for firmware to unpack ..."
+	ebegin "Checking for firmware to unpack"
 	if [ -e /lib/firmware.tar.bz2 ]
 	then
-		ebegin "Unpacking firmware ..."
+		eindent
+		ebegin "Unpacking firmware"
 		mkdir -p /lib/firmware
 		tar xjf /lib/firmware.tar.bz2 -C /lib/firmware
 		eend 0
+		eoutdent
 	fi
 	[ -x /sbin/udevadm ] && /sbin/udevadm trigger
+	eend $?
 }

diff --git a/init.d/fixinittab b/init.d/fixinittab
index c5ca55c..36bdc27 100755
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -12,7 +12,7 @@ start()
 		return 1
 	fi
 
-	einfo "Adjusting inittab ..."
+	ebegin "Adjusting inittab"
 	# Create a backup
 	cp -f /etc/inittab /etc/inittab.old
 
@@ -62,8 +62,11 @@ start()
 		fi
 		if [ -c "/dev/hvc0" ]
 		then
-			einfo "Adding hvc console to inittab ..."
+			eindent
+			ebegin "Adding hvc console to inittab ..."
 			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab
+			eend $?
+			eoutdent
 		fi
 
 	# The rest...
@@ -75,8 +78,11 @@ start()
 				echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
 			done
 		else
-			einfo "Adding ${LIVECD_CONSOLE} console to inittab ..."
+			eindent
+			ebegin "Adding ${LIVECD_CONSOLE} console to inittab"
 			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
+			eend $?
+			eoutdent
 		fi
 	fi
 
@@ -99,5 +105,4 @@ start()
 	telinit q
 
 	eend 0
-	return 0
 }

diff --git a/init.d/hwsetup b/init.d/hwsetup
index 60e1bb4..a13e3be 100755
--- a/init.d/hwsetup
+++ b/init.d/hwsetup
@@ -8,7 +8,8 @@ depend() {
 }
 
 start() {
-	einfo "Starting hwsetup ..."
+	ebegin "Starting hwsetup"
 	[ -e /etc/sysconfig ] || mkdir -p /etc/sysconfig
 	[ -x /usr/sbin/hwsetup ] && hwsetup
+	eend $?
 }

diff --git a/init.d/unmute b/init.d/unmute
index 9f0f3f9..4ce6db9 100755
--- a/init.d/unmute
+++ b/init.d/unmute
@@ -11,7 +11,7 @@ start()
 	then
 		for i in $(cat /proc/asound/cards | awk '{print $1}' | grep ^[[:digit:]])
 		do
-			einfo "Unmuting sound card $i ..."
+			ebegin "Unmuting sound card $i"
 			if [ -d /proc/asound/card$i ] && [ -x /usr/bin/amixer ]
 			then
 				amixer -c $i scontrols > /etc/amixer
@@ -43,6 +43,7 @@ start()
 					&& amixer -c $i -q set Capture 95% unmute cap \
 					>/dev/null 2>&1
 			fi
+			eend 0
 		done
 	fi
 	return 0

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

[Jorge Manuel B. S. Vicetto]

commit:     f844731d34172ac388f2ecf3ae1f1a2b53eb08e1
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 01:38:41 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 01:38:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=f844731d

Applied Fernando V. Orocu (likewhoa) patch to fix cosmetic issues with e* functions - fixes bug 379821.

---
 init.d/autoconfig |    2 +-
 init.d/firmware   |    4 ++--
 init.d/fixinittab |    6 +++---
 init.d/hwsetup    |    2 +-
 init.d/unmute     |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 6ab1a6f..056ff85 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -376,7 +376,7 @@ detect_sparc() {
 }
 
 start() {
-	einfo "starting autoconfig"
+	einfo "Starting autoconfig ..."
 	echo "0" > /proc/sys/kernel/printk
 	get_config
 

diff --git a/init.d/firmware b/init.d/firmware
index 35919c2..30d07c9 100755
--- a/init.d/firmware
+++ b/init.d/firmware
@@ -10,10 +10,10 @@ depend() {
 }
 
 start() {
-einfo checking for firmware to unpack
+einfo "Checking for firmware to unpack ..."
 	if [ -e /lib/firmware.tar.bz2 ]
 	then
-		ebegin "Unpacking firmware"
+		ebegin "Unpacking firmware ..."
 		mkdir -p /lib/firmware
 		tar xjf /lib/firmware.tar.bz2 -C /lib/firmware
 		eend 0

diff --git a/init.d/fixinittab b/init.d/fixinittab
index 5c0d48a..c5ca55c 100755
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -12,7 +12,7 @@ start()
 		return 1
 	fi
 
-	einfo "adjusting inittab"
+	einfo "Adjusting inittab ..."
 	# Create a backup
 	cp -f /etc/inittab /etc/inittab.old
 
@@ -62,7 +62,7 @@ start()
 		fi
 		if [ -c "/dev/hvc0" ]
 		then
-			einfo "Adding hvc console to inittab"
+			einfo "Adding hvc console to inittab ..."
 			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab
 		fi
 
@@ -75,7 +75,7 @@ start()
 				echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
 			done
 		else
-			einfo "Adding ${LIVECD_CONSOLE} console to inittab"
+			einfo "Adding ${LIVECD_CONSOLE} console to inittab ..."
 			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
 		fi
 	fi

diff --git a/init.d/hwsetup b/init.d/hwsetup
index aac4db5..60e1bb4 100755
--- a/init.d/hwsetup
+++ b/init.d/hwsetup
@@ -8,7 +8,7 @@ depend() {
 }
 
 start() {
-	einfo starting hwsetup
+	einfo "Starting hwsetup ..."
 	[ -e /etc/sysconfig ] || mkdir -p /etc/sysconfig
 	[ -x /usr/sbin/hwsetup ] && hwsetup
 }

diff --git a/init.d/unmute b/init.d/unmute
index 7e73c83..9f0f3f9 100755
--- a/init.d/unmute
+++ b/init.d/unmute
@@ -11,7 +11,7 @@ start()
 	then
 		for i in $(cat /proc/asound/cards | awk '{print $1}' | grep ^[[:digit:]])
 		do
-			einfo "unmuting sound card $i"
+			einfo "Unmuting sound card $i ..."
 			if [ -d /proc/asound/card$i ] && [ -x /usr/bin/amixer ]
 			then
 				amixer -c $i scontrols > /etc/amixer

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

[William Hubbs]

commit:     33a956b55848f7212b1382b8dad83913d6d992cd
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 20:28:34 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 20:28:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=33a956b5

update fixinittab to use mingetty for consoles

---
 init.d/fixinittab |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/fixinittab b/init.d/fixinittab
index d355684..5c0d48a 100755
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -72,7 +72,7 @@ start()
 		then
 			for x in 1 2 3 4 5 6
 			do
-				echo "c${x}:12345:respawn:/sbin/agetty -nl /bin/bashlogin 38400 tty${x} linux" >> /etc/inittab
+				echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
 			done
 		else
 			einfo "Adding ${LIVECD_CONSOLE} console to inittab"

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

[William Hubbs]

commit:     56aac9bfd8ed6d4b5e52d6fdc7a4edba57269d88
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 20:11:08 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 20:11:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=56aac9bf

Revert "modify the fixinittab service to allow autologin on the consoles"

This reverts commit f5a0172d4c65049d5bb86c770d5cb52b324d77e3.

---
 init.d/fixinittab |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/init.d/fixinittab b/init.d/fixinittab
index 2691d53..d355684 100755
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -34,14 +34,14 @@ start()
 		if [ -c "/dev/ttyS0" ]
 		then
 			LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyS0 speed)
-			echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ttyS0 vt100" >> /etc/inittab
+			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyS0 vt100" >> /etc/inittab
 		fi
 		# HPPA software PDC console (K-models)
 		if [ "${LIVECD_CONSOLE}" = "ttyB0" ]
 		then
 			mknod /dev/ttyB0 c 11 0
 			LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyB0 speed)
-			echo "b0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
+			echo "b0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
 		fi
 		# FB / STI console
 		if [ -c "/dev/vc/1" -o -c "/dev/tts/1" -o -c "/dev/tty2" ]
@@ -51,19 +51,19 @@ start()
 			then
 			    for x in 0 1 2 3 4 5 6
 			    do
-				    echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" tty${x}" >> /etc/inittab
+				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
 			    done
 			else
 			    for x in 1 2 3 4 5 6
 			    do
-				    echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" tty${x}" >> /etc/inittab
+				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
 			    done
 			fi
 		fi
 		if [ -c "/dev/hvc0" ]
 		then
 			einfo "Adding hvc console to inittab"
-			echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" 9600 hvc0 vt320" >> /etc/inittab
+			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab
 		fi
 
 	# The rest...
@@ -72,11 +72,11 @@ start()
 		then
 			for x in 1 2 3 4 5 6
 			do
-				echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" 38400 tty${x} linux" >> /etc/inittab
+				echo "c${x}:12345:respawn:/sbin/agetty -nl /bin/bashlogin 38400 tty${x} linux" >> /etc/inittab
 			done
 		else
 			einfo "Adding ${LIVECD_CONSOLE} console to inittab"
-			echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
+			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
 		fi
 	fi
 
@@ -91,7 +91,7 @@ start()
 				*options\ \'[0-9]*) speed=`echo "$x" | sed "s/.*options '//; s/[^0-9].*//"` ;;
 				*) speed=9600 ;;  # choose a default, only matters if it is serial
 			esac
-			echo "$id:12345:respawn:/sbin/agetty -l "/bin/login root" ${speed} ${line} vt100" >> /etc/inittab
+			echo "$id:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${speed} ${line} vt100" >> /etc/inittab
 		done
 	fi
 

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

[William Hubbs]

commit:     f5a0172d4c65049d5bb86c770d5cb52b324d77e3
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 05:11:44 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 05:20:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=f5a0172d

modify the fixinittab service to allow autologin on the consoles

I would like to thank jmbsvicetto <AT> gentoo.org for this patch.

---
 init.d/fixinittab |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/init.d/fixinittab b/init.d/fixinittab
index d355684..2691d53 100755
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -34,14 +34,14 @@ start()
 		if [ -c "/dev/ttyS0" ]
 		then
 			LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyS0 speed)
-			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyS0 vt100" >> /etc/inittab
+			echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ttyS0 vt100" >> /etc/inittab
 		fi
 		# HPPA software PDC console (K-models)
 		if [ "${LIVECD_CONSOLE}" = "ttyB0" ]
 		then
 			mknod /dev/ttyB0 c 11 0
 			LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyB0 speed)
-			echo "b0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
+			echo "b0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
 		fi
 		# FB / STI console
 		if [ -c "/dev/vc/1" -o -c "/dev/tts/1" -o -c "/dev/tty2" ]
@@ -51,19 +51,19 @@ start()
 			then
 			    for x in 0 1 2 3 4 5 6
 			    do
-				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
+				    echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" tty${x}" >> /etc/inittab
 			    done
 			else
 			    for x in 1 2 3 4 5 6
 			    do
-				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
+				    echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" tty${x}" >> /etc/inittab
 			    done
 			fi
 		fi
 		if [ -c "/dev/hvc0" ]
 		then
 			einfo "Adding hvc console to inittab"
-			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab
+			echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" 9600 hvc0 vt320" >> /etc/inittab
 		fi
 
 	# The rest...
@@ -72,11 +72,11 @@ start()
 		then
 			for x in 1 2 3 4 5 6
 			do
-				echo "c${x}:12345:respawn:/sbin/agetty -nl /bin/bashlogin 38400 tty${x} linux" >> /etc/inittab
+				echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" 38400 tty${x} linux" >> /etc/inittab
 			done
 		else
 			einfo "Adding ${LIVECD_CONSOLE} console to inittab"
-			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
+			echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
 		fi
 	fi
 
@@ -91,7 +91,7 @@ start()
 				*options\ \'[0-9]*) speed=`echo "$x" | sed "s/.*options '//; s/[^0-9].*//"` ;;
 				*) speed=9600 ;;  # choose a default, only matters if it is serial
 			esac
-			echo "$id:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${speed} ${line} vt100" >> /etc/inittab
+			echo "$id:12345:respawn:/sbin/agetty -l "/bin/login root" ${speed} ${line} vt100" >> /etc/inittab
 		done
 	fi
 

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

[William Hubbs]

commit:     229c96920e4bc4a3d793d260b79c9c4382ca7af1
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Jun 28 05:17:28 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 05:17:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=229c9692

Revert "modify the fixinittab service to allow autologin on the consoles"

This reverts commit f8014344d03a553418b3f5153c3c3cebc2ca131b.

---
 init.d/fixinittab |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/init.d/fixinittab b/init.d/fixinittab
index 2691d53..d355684 100755
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -34,14 +34,14 @@ start()
 		if [ -c "/dev/ttyS0" ]
 		then
 			LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyS0 speed)
-			echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ttyS0 vt100" >> /etc/inittab
+			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyS0 vt100" >> /etc/inittab
 		fi
 		# HPPA software PDC console (K-models)
 		if [ "${LIVECD_CONSOLE}" = "ttyB0" ]
 		then
 			mknod /dev/ttyB0 c 11 0
 			LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyB0 speed)
-			echo "b0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
+			echo "b0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
 		fi
 		# FB / STI console
 		if [ -c "/dev/vc/1" -o -c "/dev/tts/1" -o -c "/dev/tty2" ]
@@ -51,19 +51,19 @@ start()
 			then
 			    for x in 0 1 2 3 4 5 6
 			    do
-				    echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" tty${x}" >> /etc/inittab
+				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
 			    done
 			else
 			    for x in 1 2 3 4 5 6
 			    do
-				    echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" tty${x}" >> /etc/inittab
+				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
 			    done
 			fi
 		fi
 		if [ -c "/dev/hvc0" ]
 		then
 			einfo "Adding hvc console to inittab"
-			echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" 9600 hvc0 vt320" >> /etc/inittab
+			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab
 		fi
 
 	# The rest...
@@ -72,11 +72,11 @@ start()
 		then
 			for x in 1 2 3 4 5 6
 			do
-				echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" 38400 tty${x} linux" >> /etc/inittab
+				echo "c${x}:12345:respawn:/sbin/agetty -nl /bin/bashlogin 38400 tty${x} linux" >> /etc/inittab
 			done
 		else
 			einfo "Adding ${LIVECD_CONSOLE} console to inittab"
-			echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
+			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
 		fi
 	fi
 
@@ -91,7 +91,7 @@ start()
 				*options\ \'[0-9]*) speed=`echo "$x" | sed "s/.*options '//; s/[^0-9].*//"` ;;
 				*) speed=9600 ;;  # choose a default, only matters if it is serial
 			esac
-			echo "$id:12345:respawn:/sbin/agetty -l "/bin/login root" ${speed} ${line} vt100" >> /etc/inittab
+			echo "$id:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${speed} ${line} vt100" >> /etc/inittab
 		done
 	fi
 

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

[William Hubbs]

commit:     f8014344d03a553418b3f5153c3c3cebc2ca131b
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Jun 28 05:11:44 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 05:11:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=f8014344

modify the fixinittab service to allow autologin on the consoles

---
 init.d/fixinittab |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/init.d/fixinittab b/init.d/fixinittab
index d355684..2691d53 100755
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -34,14 +34,14 @@ start()
 		if [ -c "/dev/ttyS0" ]
 		then
 			LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyS0 speed)
-			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyS0 vt100" >> /etc/inittab
+			echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ttyS0 vt100" >> /etc/inittab
 		fi
 		# HPPA software PDC console (K-models)
 		if [ "${LIVECD_CONSOLE}" = "ttyB0" ]
 		then
 			mknod /dev/ttyB0 c 11 0
 			LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyB0 speed)
-			echo "b0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
+			echo "b0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
 		fi
 		# FB / STI console
 		if [ -c "/dev/vc/1" -o -c "/dev/tts/1" -o -c "/dev/tty2" ]
@@ -51,19 +51,19 @@ start()
 			then
 			    for x in 0 1 2 3 4 5 6
 			    do
-				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
+				    echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" tty${x}" >> /etc/inittab
 			    done
 			else
 			    for x in 1 2 3 4 5 6
 			    do
-				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
+				    echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" tty${x}" >> /etc/inittab
 			    done
 			fi
 		fi
 		if [ -c "/dev/hvc0" ]
 		then
 			einfo "Adding hvc console to inittab"
-			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab
+			echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" 9600 hvc0 vt320" >> /etc/inittab
 		fi
 
 	# The rest...
@@ -72,11 +72,11 @@ start()
 		then
 			for x in 1 2 3 4 5 6
 			do
-				echo "c${x}:12345:respawn:/sbin/agetty -nl /bin/bashlogin 38400 tty${x} linux" >> /etc/inittab
+				echo "c${x}:12345:respawn:/sbin/agetty -l "/bin/login root" 38400 tty${x} linux" >> /etc/inittab
 			done
 		else
 			einfo "Adding ${LIVECD_CONSOLE} console to inittab"
-			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
+			echo "s0:12345:respawn:/sbin/agetty -l "/bin/login root" ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
 		fi
 	fi
 
@@ -91,7 +91,7 @@ start()
 				*options\ \'[0-9]*) speed=`echo "$x" | sed "s/.*options '//; s/[^0-9].*//"` ;;
 				*) speed=9600 ;;  # choose a default, only matters if it is serial
 			esac
-			echo "$id:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${speed} ${line} vt100" >> /etc/inittab
+			echo "$id:12345:respawn:/sbin/agetty -l "/bin/login root" ${speed} ${line} vt100" >> /etc/inittab
 		done
 	fi
 

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

[William Hubbs]

commit:     363bac75e34c987c361e143aea58ecf06a231502
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun May  1 03:47:34 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May  1 03:47:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=363bac75

comment out the ttyB0 line in inittab

I would like to thank gmsoft for this patch.

---
 init.d/fixinittab |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/init.d/fixinittab b/init.d/fixinittab
index c65fcdc..d355684 100755
--- a/init.d/fixinittab
+++ b/init.d/fixinittab
@@ -19,6 +19,7 @@ start()
 	# Comment out current getty settings
 	sed -i -e '/^c[0-9]/ s/^/#/' /etc/inittab
 	sed -i -e '/^s[01]/ s/^/#/' /etc/inittab
+	sed -i -e '/^b0/ s/^/#/' /etc/inittab
 
 	# SPARC & HPPA console magic
 	if [ "${HOSTTYPE}" = "sparc" -o "${HOSTTYPE}" = "hppa" -o "${HOSTTYPE}" = "ppc64" ]

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

[William Hubbs]

commit:     2fe6f9e78e9ee3693c4687afb7390896a7d0e6a2
Author:     Fernando Orocu <fernando <AT> gentooligans <DOT> com>
AuthorDate: Tue Mar  8 18:17:49 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May  1 02:46:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=2fe6f9e7

stop xdm if X11 is not requested

Xdm is being started very early in the boot sequence, before autoconfig,
so we need to stop it if the user doesn't want X11.

---
 init.d/autoconfig |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 4854cb8..51657c8 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -588,8 +588,9 @@ start() {
 	killall hwsetup 2>/dev/null
 	echo "6" > /proc/sys/kernel/printk
 
-	if yesno "${SPEAKUP}"
+	if ! yesno "${X11}"
 	then
+		rc-service xdm stop
 		splash_manager -c set -t livecd-10 -m v > /dev/null 2>&1
 		reset
 		chvt 1

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

[William Hubbs]

commit:     5bdfa8ccc47ac834adab356dc0d8dfb184ff1e59
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 22:50:09 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May  1 02:46:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=5bdfa8cc

split out firmware extraction and hwsetup

Firmware extraction and hwsetup are now separate services.

---
 init.d/autoconfig |   30 +++++-------------------------
 init.d/firmware   |   22 ++++++++++++++++++++++
 init.d/hwsetup    |   14 ++++++++++++++
 3 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 55fbcfd..e2655a6 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -272,6 +272,10 @@ list_services() {
 	svcs="${svcs} $(check_svc ${APM} apmd)"
 	svcs="${svcs} $(check_svc ${BRLTTY} brltty)"
 	svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)"
+	if yesno "$COLDPLUG" && ! rc-service -e coldplug && ! rc-service -e hotplug
+	then
+		echo firmware hwsetup
+	fi
 	svcs="${svcs} $(check_svc ${GPM} gpm-pre)"
 	svcs="${svcs} $(check_svc ${GPM} gpm)"
 	svcs="${svcs} $(check_svc ${IDEDMA} hdparm)"
@@ -287,17 +291,6 @@ list_services() {
 	echo ${svcs}
 }
 
-unpack_firmware() {
-	# This unpacks any firmware tarballs.
-	if [ -e /lib/firmware.tar.bz2 ]
-	then
-		ebegin "Unpacking firmware"
-		mkdir -p /lib/firmware
-		tar xjf /lib/firmware.tar.bz2 -C /lib/firmware
-		eend 0
-	fi
-}
-
 get_info() {
 	local tmp
 
@@ -460,21 +453,8 @@ start() {
 		ewarn "Hardware detection disabled via cmdline ..."
 	fi
 
-	# Now, we check if we are supposed to run a coldplug script.
-	if yesno "${COLDPLUG}"
+	if ! yesno "${COLDPLUG}"
 	then
-		# Check whether we should be using hotplug/coldplug or whether we should
-		# just let udev do it all.
-		# coldplug+hotplug would already be up due to list_services
-		if ! rc-service -e coldplug && ! rc-service -e hotplug
-		then
-			# TODO: This needs to go to a seperate script, so that hwsetup can depend on it.
-			unpack_firmware
-			[ -x /sbin/udevtrigger ] && /sbin/udevtrigger
-		fi
-		[ -e /etc/sysconfig ] || mkdir -p /etc/sysconfig
-		[ -x /usr/sbin/hwsetup ] && hwsetup
-	else
 		ewarn "Hotplug/Coldplug disabled via cmdline ..."
 	fi
 

diff --git a/init.d/firmware b/init.d/firmware
new file mode 100755
index 0000000..d65d601
--- /dev/null
+++ b/init.d/firmware
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# This unpacks any firmware tarballs.
+
+depend() {
+	:
+}
+
+start() {
+einfo checking for firmware to unpack
+	if [ -e /lib/firmware.tar.bz2 ]
+	then
+		ebegin "Unpacking firmware"
+		mkdir -p /lib/firmware
+		tar xjf /lib/firmware.tar.bz2 -C /lib/firmware
+		eend 0
+	fi
+	[ -x /sbin/udevtrigger ] && /sbin/udevtrigger
+}

diff --git a/init.d/hwsetup b/init.d/hwsetup
new file mode 100755
index 0000000..aac4db5
--- /dev/null
+++ b/init.d/hwsetup
@@ -0,0 +1,14 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need firmware
+}
+
+start() {
+	einfo starting hwsetup
+	[ -e /etc/sysconfig ] || mkdir -p /etc/sysconfig
+	[ -x /usr/sbin/hwsetup ] && hwsetup
+}

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

[William Hubbs]

commit:     2e8a26950dbdd7a37d401ca811e3cfd3f133bc42
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 19:56:59 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May  1 02:46:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=2e8a2695

reset splash to verbose mode for speakup users

---
 init.d/autoconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index e2655a6..df1a8d1 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -587,6 +587,9 @@ start() {
 
 	killall hwsetup 2>/dev/null
 	echo "6" > /proc/sys/kernel/printk
+	splash_manager -c set -t livecd-10 -m v > /dev/null 2>&1
+	reset
+	chvt 1
 }
 
 # vim: ts=4

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

[William Hubbs]

commit:     dfbe8f3755ef85683c4f3a0b13095bfc5efb67db
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 18:47:25 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May  1 02:46:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=dfbe8f37

fix udevtrigger call

The udevtrigger program has been replaced with udevadm.

---
 init.d/firmware |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/firmware b/init.d/firmware
index d65d601..35919c2 100755
--- a/init.d/firmware
+++ b/init.d/firmware
@@ -18,5 +18,5 @@ einfo checking for firmware to unpack
 		tar xjf /lib/firmware.tar.bz2 -C /lib/firmware
 		eend 0
 	fi
-	[ -x /sbin/udevtrigger ] && /sbin/udevtrigger
+	[ -x /sbin/udevadm ] && /sbin/udevadm trigger
 }

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

[William Hubbs]

commit:     92dfcf16f04261c99a7eb4e1320d5fc933ae4a70
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 21:46:10 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May  1 02:46:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=92dfcf16

add check to be sure splash is only reset for speakup users

---
 init.d/autoconfig |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index df1a8d1..4854cb8 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -587,9 +587,13 @@ start() {
 
 	killall hwsetup 2>/dev/null
 	echo "6" > /proc/sys/kernel/printk
-	splash_manager -c set -t livecd-10 -m v > /dev/null 2>&1
-	reset
-	chvt 1
+
+	if yesno "${SPEAKUP}"
+	then
+		splash_manager -c set -t livecd-10 -m v > /dev/null 2>&1
+		reset
+		chvt 1
+	fi
 }
 
 # vim: ts=4

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

[William Hubbs]

commit:     9ea6722a3511a06eb670258be7274902b7c49b37
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 14 03:15:18 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May  1 02:46:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=9ea6722a

start gpm-pre before gpm from autoconfig

---
 init.d/autoconfig |    1 +
 init.d/gpm-pre    |    5 -----
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index eb21020..55fbcfd 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -272,6 +272,7 @@ list_services() {
 	svcs="${svcs} $(check_svc ${APM} apmd)"
 	svcs="${svcs} $(check_svc ${BRLTTY} brltty)"
 	svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)"
+	svcs="${svcs} $(check_svc ${GPM} gpm-pre)"
 	svcs="${svcs} $(check_svc ${GPM} gpm)"
 	svcs="${svcs} $(check_svc ${IDEDMA} hdparm)"
 	svcs="${svcs} $(check_svc ${NFS} nfsmount)"

diff --git a/init.d/gpm-pre b/init.d/gpm-pre
index af52b0e..f44e5c2 100755
--- a/init.d/gpm-pre
+++ b/init.d/gpm-pre
@@ -3,11 +3,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-# Do one of the following:
-# Add to /etc/rc.conf: rc_gpm_need="autoconfig-gpm-pre"
-# XOR
-# Add to /etc/conf.d/gpm: rc_need="autoconfig-gpm-pre"
-
 depend() {
 	before gpm
 	need hwsetup

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

[William Hubbs]

commit:     2ca561fc6ccfe1407de33597a5a2282715581a77
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 20:20:17 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May  1 02:46:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=2ca561fc

add a message so we know autoconfig has started

---
 init.d/autoconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 9eec5ce..eb21020 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -410,6 +410,7 @@ detect_sparc() {
 }
 
 start() {
+	einfo "starting autoconfig"
 	echo "0" > /proc/sys/kernel/printk
 	get_config
 

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

[William Hubbs]

commit:     2be9f3ec4e20ea043bc9990844a0dcd2662a42a4
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 19:49:15 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May  1 02:46:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=2be9f3ec

make gpm-pre executable

---
 0 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/init.d/gpm-pre b/init.d/gpm-pre
old mode 100644
new mode 100755