From 2ea1e9e53b9b0eb4da81ca20d3359025919d1cb4 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 7 Aug 2017 09:39:44 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 conf.d/agetty    | 2 +-
 conf.d/killprocs | 5 ++++-
 init.d/agetty    | 2 +-
 init.d/bootmisc  | 2 +-
 init.d/hostname  | 9 +++++----
 init.d/killprocs | 4 ++--
 init.d/sysfs     | 2 +-
 7 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/conf.d/agetty b/conf.d/agetty
index 012eb8d..527ce4c 100644
--- 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 0cf10d0..76a2bc9 100644
--- 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 bad0218..d2c31fc 100755
--- 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 b42c14f..976ec19 100755
--- 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 81969f8..9b53c61 100755
--- 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 d15cb44..93aa8bb 100755
--- 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 67edd4c..55e1258 100755
--- 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
-- 
2.39.5