saving uncommitted changes in /etc prior to emerge run

diff --git a/conf.d/agetty b/conf.d/agetty
index 012eb8de152d93f7f2572688e8e33e5505563878..527ce4c2a36b93fc895cde209b8322bcb289f391 100644 (file)
--- a/conf.d/agetty
+++ b/conf.d/agetty
@@ -2,7 +2,7 @@
 #baud=""
 
 # set the terminal type
-#termtype="linux"
+#term_type="linux"
 
 # extra options to pass to agetty for this port
 #agetty_options=""

diff --git a/conf.d/killprocs b/conf.d/killprocs
index 0cf10d0d72b890b84a9f4cb3d72ae6803b09d3bb..76a2bc9c38609558cc2ac0975fdbc1d9b2a8bcab 100644 (file)
--- a/conf.d/killprocs
+++ b/conf.d/killprocs
@@ -1,3 +1,6 @@
-# If you wish to pass any options to killall5 during shutdown,
+# If you wish to pass any options to kill_all during shutdown,
 # you should do so here.
+#
+# The setting is called killall5_opts because the options here are meant
+# to be identical to those you could pass to killall5.
 killall5_opts=""

diff --git a/init.d/agetty b/init.d/agetty
index bad02184b202865edfddab2bd9442e759f9e7a06..d2c31fc5abac7b02cae6572193c7d7da1561eabf 100755 (executable)
--- a/init.d/agetty
+++ b/init.d/agetty
@@ -14,7 +14,7 @@ supervisor=supervise-daemon
 port="${RC_SVCNAME#*.}"
 term_type="${term_type:-linux}"
 command=/sbin/agetty
-command_args_foreground="${agetty_options} ${port} ${baud} ${termtype}"
+command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}"
 pidfile="/run/${RC_SVCNAME}.pid"
 
 depend() {

diff --git a/init.d/bootmisc b/init.d/bootmisc
index b42c14f51412dd74dd7f67352e0c5645042a936d..976ec195e4b01f9454d1b78a65d6b99f760f0c3b 100755 (executable)
--- a/init.d/bootmisc
+++ b/init.d/bootmisc
@@ -241,7 +241,7 @@ stop()
 {
        # Write a halt record if we're shutting down
        if [ "$RC_RUNLEVEL" = shutdown ]; then
-               [ "$RC_UNAME" = Linux ] && halt -w
+               [ "$RC_UNAME" = Linux ] && openrc-shutdown -w
                if [ "$RC_SYS" = OPENVZ ]; then
                        yesno $RC_REBOOT && printf "" >/reboot
                fi

diff --git a/init.d/hostname b/init.d/hostname
index 81969f8bdb35f505bb3b5d8ff080c0f57a904a1a..9b53c61ab2000eae25906f58de315854045504e3 100755 (executable)
--- a/init.d/hostname
+++ b/init.d/hostname
@@ -11,7 +11,8 @@
 
 description="Sets the hostname of the machine."
 
-depend() {
+depend()
+{
        after clock
        keyword -docker -lxc -prefix -systemd-nspawn
 }
@@ -20,12 +21,12 @@ start()
 {
        local h source x
        if [ -s /etc/hostname ] && [ -r /etc/hostname ]; then
-       read h x </etc/hostname
-       source=" from /etc/hostname"
+               read h x </etc/hostname
+               source="from /etc/hostname"
        else
                # HOSTNAME variable used to be defined in caps in conf.d/hostname.
                # It is also a magic variable in bash.
-               h=${hostname-${HOSTNAME}} # checkbashisms: false positive
+               h=${hostname:-${HOSTNAME}} # checkbashisms: false positive (HOSTNAME var)
        fi
        if [ -z "$h" ]; then
                einfo "Using default system hostname"

diff --git a/init.d/killprocs b/init.d/killprocs
index d15cb443edfaea392ee1a6e93e4c74270efdaa01..93aa8bbf228df1290d7e961e3dae07dd1f261647 100755 (executable)
--- a/init.d/killprocs
+++ b/init.d/killprocs
@@ -19,9 +19,9 @@ depend()
 start()
 {
        ebegin "Terminating remaining processes"
-       killall5 -15 ${killall5_opts}
+       kill_all 15 ${killall5_opts}
        eend 0
        ebegin "Killing remaining processes"
-       killall5 -9 ${killall5_opts}
+       kill_all 9 ${killall5_opts}
        eend 0
 }

diff --git a/init.d/sysfs b/init.d/sysfs
index 67edd4c5de19dea1efcaa31cd7c14b6d2dffd111..55e12588366011287308c2b25ce91e52ca0c525b 100755 (executable)
--- a/init.d/sysfs
+++ b/init.d/sysfs
@@ -101,7 +101,7 @@ mount_misc()
        if [ -d /sys/firmware/efi/efivars ] &&
                ! mountinfo -q /sys/firmware/efi/efivars; then
                ebegin "Mounting efivarfs filesystem"
-               mount -n -t efivarfs -o ${sysfs_opts} \
+               mount -n -t efivarfs -o ro \
                        efivarfs /sys/firmware/efi/efivars 2> /dev/null
                eend 0
        fi