[gentoo-commits] proj/livecd-tools:master commit in: init.d/
commit: b1798f17818d9cf4a4563a8a48d2fa4130db0a16
Author: Ben Kohler gentoo org>
AuthorDate: Tue Feb 27 16:56:51 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Tue Feb 27 16:56:51 2024 +
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 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/
commit: 8907313e7ca1d065b9d49a29afeade02ea8a49b8
Author: Georgy Yakovlev gentoo org>
AuthorDate: Thu Jul 29 03:57:28 2021 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Thu Jul 29 04:04:27 2021 +
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 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/
commit: b56c91635b59314f97184d726f93249da594731b
Author: Ben Kohler gentoo org>
AuthorDate: Thu Feb 25 23:10:40 2021 +
Commit: Ben Kohler gentoo org>
CommitDate: Thu Feb 25 23:10:40 2021 +
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 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/
commit: 4bdbca1aa0a566f03721a9d3622102d5d2fab318
Author: Matt Turner gentoo org>
AuthorDate: Fri Nov 6 00:58:09 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Nov 6 00:58:09 2020 +
URL:https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=4bdbca1a
unmute: Rewrite without awk
Signed-off-by: Matt Turner 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/
commit: 58948705bcf5136401621a8855e9f0c15049e1dd
Author: Matt Turner gentoo org>
AuthorDate: Fri Nov 6 00:27:40 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Nov 6 00:29:07 2020 +
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 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/
commit: 62ef870732d99d99b987fc34964a023d3711824c
Author: Georgy Yakovlev gentoo org>
AuthorDate: Thu Nov 5 03:15:14 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Nov 5 23:28:48 2020 +
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 gentoo.org>
Signed-off-by: Matt Turner 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..000
--- 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/
commit: d3ef3b3d67a6bea6001029ecde452a022da4ffeb
Author: Georgy Yakovlev gentoo org>
AuthorDate: Thu Nov 5 03:29:16 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Nov 5 23:29:35 2020 +
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 gentoo.org>
Signed-off-by: Matt Turner 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/
commit: 15d17333c8e7e5ef038ea288ccc98522c51f4fba
Author: Georgy Yakovlev gentoo org>
AuthorDate: Thu Nov 5 03:15:13 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Nov 5 23:28:34 2020 +
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 gentoo.org>
Signed-off-by: Matt Turner 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..000
--- 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/
commit: 55897d049a5a479028783def544fd616cbc53427
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Thu Apr 23 18:08:16 2020 +
Commit: Rick Farina gentoo org>
CommitDate: Thu Apr 23 18:08:16 2020 +
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) 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/
commit: 6eaed10f7edbfc0058ade30aa4a64707574f42a5
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Thu Sep 26 16:50:35 2019 +
Commit: Rick Farina gentoo org>
CommitDate: Thu Sep 26 16:50:35 2019 +
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
[gentoo-commits] proj/livecd-tools:master commit in: init.d/
commit: 6f0afe2a70bf7d8c5a9ef1e1e3fe3e83b6aece2b
Author: Matt Turner gentoo org>
AuthorDate: Thu Sep 19 17:20:21 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Sep 19 17:20:21 2019 +
URL:https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=6f0afe2a
fixinittab: Support SPARC's ttyHV0 console device
Signed-off-by: Matt Turner 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/
commit: 3c23b30aed805fb5f6b148f273c0c139eac8f6f3
Author: Matt Turner gentoo org>
AuthorDate: Thu Sep 19 17:18:18 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Sep 19 17:19:37 2019 +
URL:https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=3c23b30a
fixinittab: Refactor HW-specific serial console support
Signed-off-by: Matt Turner 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/
commit: 098ff810778e35116ccc2ee37cf8912c3cb486c7
Author: Luca Barbato gentoo org>
AuthorDate: Sat Aug 18 07:36:49 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Sep 14 05:26:45 2018 +
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/
commit: 82eab2c4e4cb5ab7d9fb9a560377f2472cadae2d
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Fri Aug 24 14:54:37 2018 +
Commit: Richard Farina gentoo org>
CommitDate: Fri Aug 24 14:55:53 2018 +
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/
commit: 8153df03e15624ba4319d2fc9b1fd1fefb47cd86
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Fri Mar 16 01:06:36 2018 +
Commit: Richard Farina gentoo org>
CommitDate: Fri Mar 16 01:06:36 2018 +
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/
commit: 4afe3e67f65cd7e1cf910b02c25fb0bb6dbc0a1a
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Thu Mar 15 18:49:04 2018 +
Commit: Richard Farina gentoo org>
CommitDate: Thu Mar 15 18:49:04 2018 +
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/
commit: 3eca4027c0ed5aa526cbe94a92c0f0ddff8d186a
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Thu Mar 15 17:06:32 2018 +
Commit: Richard Farina gentoo org>
CommitDate: Thu Mar 15 17:06:32 2018 +
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/
commit: f672cb58a56638c9df5695015742aa3b2c37f2e8
Author: William Hubbs gmail com>
AuthorDate: Thu Mar 15 04:30:30 2018 +
Commit: William Hubbs gentoo org>
CommitDate: Thu Mar 15 04:33:30 2018 +
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/
commit: 30c14caa2b383d7ce5a41019c01fbb77a6e04c17
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Thu Mar 15 03:50:04 2018 +
Commit: Richard Farina gentoo org>
CommitDate: Thu Mar 15 03:50:04 2018 +
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/
commit: a4781f1f7cd1c5cfacfb073628a9d3bc4c0c8e99
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Mon Aug 28 18:36:33 2017 +
Commit: Richard Farina gentoo org>
CommitDate: Mon Aug 28 18:36:33 2017 +
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/
commit: 35e6ad46825721dff195ad743277af5f9bd989e1
Author: Robin H. Johnson gentoo org>
AuthorDate: Sat Feb 25 00:46:45 2017 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat Feb 25 00:46:52 2017 +
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 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/
commit: 52ec5a675d63a066dbfb62a0f7a07ee22a31e28a
Author: William Hubbs gmail com>
AuthorDate: Sat Jul 9 04:27:07 2016 +
Commit: William Hubbs gentoo org>
CommitDate: Sat Jul 9 04:27:07 2016 +
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/
commit: c1128645a2ae777f37d83477d2bccfd310e4d7c9
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Tue Dec 8 04:35:36 2015 +
Commit: William Hubbs gentoo org>
CommitDate: Fri Dec 11 17:31:03 2015 +
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/
commit: 78b624a34932581f19aa76f197aabc45b056014d
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Tue Dec 8 04:36:35 2015 +
Commit: William Hubbs gentoo org>
CommitDate: Fri Dec 11 17:49:28 2015 +
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/
commit: 259febe31230205b65045e3436a348e0c61dba82
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Sun Nov 1 20:44:21 2015 +
Commit: Richard Farina gentoo org>
CommitDate: Sun Nov 1 20:44:21 2015 +
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/
commit: 4fc3291bb56394afdcf12a762d630aaa50c7bd86 Author: William Hubbs williamh AT gentoo DOT org AuthorDate: Wed Jan 14 15:57:27 2015 + Commit: William Hubbs williamh AT gentoo DOT org CommitDate: Wed Jan 14 16:12:37 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=4fc3291b remove execute permissions from most files All of the files in init.d and conf.d in this repository do not need execute permissions. --- init.d/autoconfig | 0 init.d/fixinittab | 0 init.d/gpm-pre | 0 init.d/hwsetup | 0 init.d/unmute | 0 livecd-functions.sh | 0 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/init.d/autoconfig b/init.d/autoconfig old mode 100755 new mode 100644 diff --git a/init.d/fixinittab b/init.d/fixinittab old mode 100755 new mode 100644 diff --git a/init.d/gpm-pre b/init.d/gpm-pre old mode 100755 new mode 100644 diff --git a/init.d/hwsetup b/init.d/hwsetup old mode 100755 new mode 100644 diff --git a/init.d/unmute b/init.d/unmute old mode 100755 new mode 100644 diff --git a/livecd-functions.sh b/livecd-functions.sh old mode 100755 new mode 100644
[gentoo-commits] proj/livecd-tools:master commit in: init.d/
commit: c692089f622e4f89d62987215e8a32cccf54aa8a
Author: Rick Farina (Zero_Chaos) zerochaos AT gentoo DOT org
AuthorDate: Thu May 22 16:29:08 2014 +
Commit: Richard Farina zerochaos AT gentoo DOT org
CommitDate: Thu May 22 16:29:08 2014 +
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..000
--- 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
