From 522da6e33ab51d21a0842df09036c37f32e1676e Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 1 Mar 2017 15:32:20 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- init.d/localmount | 3 ++- init.d/loopback | 1 - init.d/modules | 12 +++++------- rc.conf | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/init.d/localmount b/init.d/localmount index 92ddec3..92ca1a0 100755 --- a/init.d/localmount +++ b/init.d/localmount @@ -22,9 +22,10 @@ depend() start() { # Mount local filesystems in /etc/fstab. + # The types variable must start with no, and must be a type local critical= types="noproc" x= no_netdev= rc= for x in $net_fs_list $extra_net_fs_list; do - types="${types},no${x}" + types="${types},${x}" done if [ "$RC_UNAME" = Linux ]; then diff --git a/init.d/loopback b/init.d/loopback index 6a0c8a1..fa7ea03 100755 --- a/init.d/loopback +++ b/init.d/loopback @@ -29,7 +29,6 @@ start() else ebegin "Bringing up network interface lo0" ifconfig lo0 127.0.0.1 netmask 255.0.0.0 - route -q add -inet 127.0.0.0 -netmask 255.0.0.0 127.0.0.1 fi eend $? } diff --git a/init.d/modules b/init.d/modules index c97bd55..a37b003 100755 --- a/init.d/modules +++ b/init.d/modules @@ -31,7 +31,7 @@ FreeBSD_modules() Linux_modules() { - # Should not fail if kernel do not have module + # Should not fail if kernel does not have module # support compiled in ... [ ! -f /proc/modules ] && return 0 @@ -48,22 +48,21 @@ Linux_modules() x=${x%.*} done - local list= x= xx= y= args= mpargs= cnt=0 a= + local list= x= xx= y= args= mpargs= a= for x in $kv_variant_list ; do eval list=\$modules_$(shell_var "$x") [ -n "$list" ] && break done [ -z "$list" ] && list=$modules + [ -n "$list" ] && ebegin "Loading kernel modules" for x in $list; do a=${x#*:} if [ "$a" = "$x" ]; then unset mpargs - ebegin "Loading module $x" else x=${x%%:*} mpargs="-o $a" - ebegin "Loading module $x as $a" fi aa=$(shell_var "$a") xx=$(shell_var "$x") @@ -75,10 +74,9 @@ Linux_modules() done [ -z "$args" ] && eval args=\$module_${aa}_args [ -z "$args" ] && eval args=\$module_${xx}_args - eval modprobe --use-blacklist -q "$mpargs" "$x" "$args" - eend $? "Failed to load $x" && : $(( cnt += 1 )) + eval modprobe --use-blacklist --verbose "$mpargs" "$x" "$args" done - einfo "Autoloaded $cnt module(s)" + [ -n "$list" ] && eend } start() diff --git a/rc.conf b/rc.conf index 68ab997..c0467e0 100644 --- a/rc.conf +++ b/rc.conf @@ -48,7 +48,7 @@ rc_shell=/sbin/sulogin # /var/log/rc.log # NOTE: Linux systems require the devfs service to be started before # logging can take place and as such cannot log the sysinit runlevel. -#rc_logger="YES" +#rc_logger="NO" # Through rc_log_path you can specify a custom log file. # The default value is: /var/log/rc.log -- 2.39.5