saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index a1d70aa6d1dba74c1a6468b302a564dcc0bd99ad..b9c49f213c0d47bbf9de791adf31fb297926c33d 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -87,7 +87,9 @@ maybe chmod 0755 'conf.d'
 maybe chmod 0644 'conf.d/apache2'
 maybe chmod 0644 'conf.d/auditd'
 maybe chmod 0644 'conf.d/bootmisc'
+maybe chmod 0644 'conf.d/busybox-klogd'
 maybe chmod 0644 'conf.d/busybox-ntpd'
+maybe chmod 0644 'conf.d/busybox-syslogd'
 maybe chmod 0644 'conf.d/busybox-watchdog'
 maybe chmod 0644 'conf.d/consolefont'
 maybe chmod 0644 'conf.d/cronie'
@@ -283,7 +285,9 @@ maybe chmod 0755 'init.d/apache2'
 maybe chmod 0755 'init.d/auditd'
 maybe chmod 0755 'init.d/binfmt'
 maybe chmod 0755 'init.d/bootmisc'
+maybe chmod 0755 'init.d/busybox-klogd'
 maybe chmod 0755 'init.d/busybox-ntpd'
+maybe chmod 0755 'init.d/busybox-syslogd'
 maybe chmod 0755 'init.d/busybox-watchdog'
 maybe chmod 0755 'init.d/consolefont'
 maybe chmod 0755 'init.d/cronie'

diff --git a/conf.d/busybox-klogd b/conf.d/busybox-klogd
new file mode 100644 (file)
index 0000000..4c16096
--- /dev/null
+++ b/conf.d/busybox-klogd
@@ -0,0 +1,9 @@
+# Config file for /etc/init.d/busybox-sysklogd
+
+# run "/sbin/klogd --help" to see all possible options.
+
+# activate if you need remote logging
+#rc_need="net"
+
+# send warnings and above to the console
+KLOGD_OPTS="-c 3"

diff --git a/conf.d/busybox-syslogd b/conf.d/busybox-syslogd
new file mode 100644 (file)
index 0000000..7df6885
--- /dev/null
+++ b/conf.d/busybox-syslogd
@@ -0,0 +1,9 @@
+# Config file for /etc/init.d/busybox-sysklogd
+
+# run "/sbin/syslogd --help" to see all possible options.
+
+# activate if you need remote logging
+#rc_need="net"
+
+# Log to shared mem buffer (use logread to read it)
+SYSLOGD_OPTS="-C128"

diff --git a/init.d/busybox-klogd b/init.d/busybox-klogd
new file mode 100755 (executable)
index 0000000..99f5f7b
--- /dev/null
+++ b/init.d/busybox-klogd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+command="/bin/busybox klogd"
+command_args="${KLOGD_OPTS}"
+pidfile="/var/run/klogd.pid"
+
+depend() {
+       need clock hostname
+}

diff --git a/init.d/busybox-syslogd b/init.d/busybox-syslogd
new file mode 100755 (executable)
index 0000000..62a99fe
--- /dev/null
+++ b/init.d/busybox-syslogd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+command="/bin/busybox syslogd"
+command_args="${SYSLOGD_OPTS}"
+pidfile="/var/run/syslogd.pid"
+
+depend() {
+       need clock hostname
+       provide logger
+}

diff --git a/portage/savedconfig/sys-apps/busybox-1.25.1 b/portage/savedconfig/sys-apps/busybox-1.25.1
index f59889325b1fdddb67fb9d6a8c4d7efdb8874fc4..3daffcba34b17446eb73718766709338e1e9e4f6 100644 (file)
--- a/portage/savedconfig/sys-apps/busybox-1.25.1
+++ b/portage/savedconfig/sys-apps/busybox-1.25.1
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.25.1
-# Fri Dec 16 14:47:27 2016
+# Wed Dec 21 12:26:28 2016
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -384,7 +384,7 @@ CONFIG_WHICH=y
 # Editors
 #
 CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
+CONFIG_FEATURE_AWK_LIBM=y
 CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
 CONFIG_CMP=y
 CONFIG_DIFF=y
@@ -1067,17 +1067,21 @@ CONFIG_FEATURE_SH_HISTFILESIZE=y
 #
 # System Logging Utilities
 #
-# CONFIG_KLOGD is not set
-# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
-# CONFIG_LOGGER is not set
-# CONFIG_LOGREAD is not set
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-# CONFIG_SYSLOGD is not set
-# CONFIG_FEATURE_ROTATE_LOGFILE is not set
-# CONFIG_FEATURE_REMOTE_LOG is not set
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
-# CONFIG_FEATURE_SYSLOGD_CFG is not set
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
-# CONFIG_FEATURE_KMSG_SYSLOG is not set
+CONFIG_KLOGD=y
+
+#
+# klogd should not be used together with syslog to kernel printk buffer
+#
+CONFIG_FEATURE_KLOGD_KLOGCTL=y
+CONFIG_LOGGER=y
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_SYSLOGD_DUP=y
+CONFIG_FEATURE_SYSLOGD_CFG=y
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_FEATURE_KMSG_SYSLOG=y