From 53a71599161b59951b4ca36b5670848691ec9330 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Tue, 18 Apr 2017 17:45:38 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 .etckeeper        |  2 ++
 conf.d/agetty     |  8 ++++++++
 conf.d/net-online | 11 +++++++----
 init.d/agetty     | 31 +++++++++++++++++++++++++++++++
 init.d/hwclock    |  3 ++-
 init.d/localmount |  4 ++--
 init.d/net-online | 27 ++++++++++-----------------
 init.d/netmount   |  2 ++
 init.d/swclock    |  5 ++++-
 init.d/sysfs      | 24 ++++++------------------
 10 files changed, 74 insertions(+), 43 deletions(-)
 create mode 100644 conf.d/agetty
 create mode 100755 init.d/agetty

diff --git a/.etckeeper b/.etckeeper
index 7e3eac3..9c61ae7 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -105,6 +105,7 @@ maybe chmod 0644 'colordiffrc'
 maybe chmod 0644 'colordiffrc-gitdiff'
 maybe chmod 0644 'colordiffrc-lightbg'
 maybe chmod 0755 'conf.d'
+maybe chmod 0644 'conf.d/agetty'
 maybe chmod 0644 'conf.d/apache2'
 maybe chmod 0644 'conf.d/auditd'
 maybe chmod 0644 'conf.d/bootmisc'
@@ -420,6 +421,7 @@ maybe chmod 0644 'idn.conf.sample'
 maybe chmod 0644 'idnalias.conf'
 maybe chmod 0644 'idnalias.conf.sample'
 maybe chmod 0755 'init.d'
+maybe chmod 0755 'init.d/agetty'
 maybe chmod 0755 'init.d/apache2'
 maybe chmod 0755 'init.d/auditd'
 maybe chmod 0755 'init.d/binfmt'
diff --git a/conf.d/agetty b/conf.d/agetty
new file mode 100644
index 0000000..012eb8d
--- /dev/null
+++ b/conf.d/agetty
@@ -0,0 +1,8 @@
+# Set the baud rate of the terminal line
+#baud=""
+
+# set the terminal type
+#termtype="linux"
+
+# extra options to pass to agetty for this port
+#agetty_options=""
diff --git a/conf.d/net-online b/conf.d/net-online
index aa2c76b..9abe9ea 100644
--- a/conf.d/net-online
+++ b/conf.d/net-online
@@ -3,10 +3,13 @@
 # default is all interfaces that support ethernet.
 #interfaces=""
 
-# This setting controls whether a ping to the default gateway is
-# included in the test for network connectivity after all interfaces
-# are active.
-#ping_default_gateway=no
+# This setting controls whether a ping test is included in the test for
+# network connectivity after all interfaces are active.
+#include_ping_test=no
+
+# This setting is the host to attempt to ping if the above is yes.
+# The default is google.com.
+#ping_test_host=some.host.name
 
 # The timeout setting controls how long the net-online service waits
 # for the network to be configured.
diff --git a/init.d/agetty b/init.d/agetty
new file mode 100755
index 0000000..c45459e
--- /dev/null
+++ b/init.d/agetty
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright (c) 2017 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+description="start agetty on a terminal line"
+supervisor=supervise-daemon
+port="${RC_SVCNAME#*.}"
+term_type="${term_type:-linux}"
+command=/sbin/agetty
+command_args_foreground="${agetty_options} ${port} ${baud} ${termtype}"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+	after local
+}
+
+start_pre() {
+	if [ -z "$port" ]; then
+		eerror "${RC_SVCNAME} cannot be started directly. You must create"
+		eerror "symbolic links to it for the ports you want to start"
+		eerror "agetty on and add those to the appropriate runlevels."
+		return 1
+	fi
+}
diff --git a/init.d/hwclock b/init.d/hwclock
index 897f021..ebe821b 100755
--- a/init.d/hwclock
+++ b/init.d/hwclock
@@ -34,7 +34,8 @@ depend()
 	if yesno $clock_adjfile; then
 		use root
 	else
-		before *
+		before binfmt bootmisc fsck hostname keymaps localmount loopback mtab
+		before procfs root swap sysctl termencoding urandom
 	fi
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
diff --git a/init.d/localmount b/init.d/localmount
index 92ca1a0..7b9271f 100755
--- a/init.d/localmount
+++ b/init.d/localmount
@@ -14,8 +14,8 @@ description="Mounts disks and swap according to /etc/fstab."
 depend()
 {
 	need fsck
-	use lvm modules mtab
-	after lvm modules
+	use lvm modules mtab root
+	after lvm modules root
 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 
diff --git a/init.d/net-online b/init.d/net-online
index 0a1e997..815c4fe 100755
--- a/init.d/net-online
+++ b/init.d/net-online
@@ -15,6 +15,7 @@ depend()
 {
 	after modules
 	need sysfs
+	provide network-online
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
 }
 
@@ -27,19 +28,6 @@ get_interfaces()
 	done
 }
 
-get_default_gateway()
-{
-	local cmd gateway
-	if command -v ip > /dev/null 2>&1; then
-		cmd="ip route show"
-	else
-		cmd=route
-	fi
-	set -- $($cmd | grep default)
-	[ "$2" != via ] && gateway="$2" || gateway="$3"
-	printf "%s" $gateway
-}
-
 start ()
 {
 	local carriers configured dev gateway ifcount infinite
@@ -66,10 +54,15 @@ start ()
 	: $((timeout -= 1))
  done
  ! $infinite && [ $timeout -eq 0 ] && rc=1
- if [ $rc -eq 0 ] && yesno ${ping_default_gateway:-no}; then
- 	gateway="$(get_default_gateway)"
- 	if [ -n "$gateway" ] && ! ping -c 1 $gateway > /dev/null 2>&1; then
-		rc=1
+ include_ping_test=${include_ping_test:-${ping_default_gateway}}
+ if [ -n "${ping_default_gateway}" ]; then
+ ewarn "ping_default_gateway is deprecated, please use include_ping_test"
+ fi
+ if [ $rc -eq 0 ] && yesno ${include_ping_test:-no}; then
+ 	ping_test_host="${ping_test_host:-google.com}"
+ 	if [ -n "$ping_test_host" ]; then
+		ping -c 1 $ping_test_host > /dev/null 2>&1
+		rc=$?
 	fi
  fi
  eend $rc "The network is offline"
diff --git a/init.d/netmount b/init.d/netmount
index 112ac88..3bb2af7 100755
--- a/init.d/netmount
+++ b/init.d/netmount
@@ -20,10 +20,12 @@ depend()
 			*) mywant="$mywant nfsclient"; break ;;
 		esac
 	done
+	after root
  	config /etc/fstab
 	want $mywant
 	use afc-client amd openvpn
 	use dns
+	use root
 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 
diff --git a/init.d/swclock b/init.d/swclock
index 9bdef99..2a93d1f 100755
--- a/init.d/swclock
+++ b/init.d/swclock
@@ -13,7 +13,10 @@ description="Sets the local clock to the mtime of a given file."
 
 depend()
 {
-	before *
+	before adjkerntz binfmt bootmisc devdb dumpon fsck hostid hostname keymaps
+	before localmount loopback modules mtab network newsyslog procfs root
+	before savecore staticroute swap swap-blk syscons sysctl syslogd
+	before termencoding ttys urandom wscons
 	provide clock
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
diff --git a/init.d/sysfs b/init.d/sysfs
index 81b5c08..67edd4c 100755
--- a/init.d/sysfs
+++ b/init.d/sysfs
@@ -15,7 +15,6 @@ sysfs_opts=nodev,noexec,nosuid
 
 depend()
 {
-	want modules
 	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
@@ -99,23 +98,12 @@ mount_misc()
 	fi
 
 	# set up kernel support for efivarfs
-	# The presence of /sys/firmware/efi indicates that the system was
-	# booted in efi mode.
-	if [ -d /sys/firmware/efi ]; then
-		if [ ! -d /sys/firmware/efi/efivars ] &&
-			modprobe -q efivarfs; then
-			ewarn "The efivarfs module needs to be configured in " \
-				  "/etc/conf.d/modules or built in"
-		fi
-		if [ -d /sys/firmware/efi/efivars ] &&
-			! mountinfo -q /sys/firmware/efi/efivars; then
-			if grep -qs efivarfs /proc/filesystems; then
-				ebegin "Mounting efivarfs filesystem"
-				mount -n -t efivarfs -o ${sysfs_opts} \
-					efivarfs /sys/firmware/efi/efivars
-				eend $?
-			fi
-		fi
+	if [ -d /sys/firmware/efi/efivars ] &&
+		! mountinfo -q /sys/firmware/efi/efivars; then
+		ebegin "Mounting efivarfs filesystem"
+		mount -n -t efivarfs -o ${sysfs_opts} \
+			efivarfs /sys/firmware/efi/efivars 2> /dev/null
+		eend 0
 	fi
 }
 
-- 
2.39.5