gentoo resync : 05.12.2021

5 files changed, 10 insertions, 5 deletions

diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 4e984d3e2d95..5cb42035ae55 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,4 +1,5 @@
-AUX bootlogd.initd 259 BLAKE2B 78c1a1fe8583685656edb85e29f8dbed40bdd7272590bbdaccb52fe6e54cce0a077a28501c7c87bec55f046172545d940c52345551cd3c01cff0895d12b32a15 SHA512 05a3c2542ceaff85c02c5c30a52be8f1bb95741fffef306777ad1b248b527cdd921f009571e1f43d7a6ede0cc61cf490a1dbbbfe0a50b234c258ad7688a37ad9
+AUX bootlogd.confd 71 BLAKE2B 5ead856ebc0af512d47b410dc4197b3287594943e535dd29c9de1b654de6dabde0a98ec8da21175d055795b7693ae52b399a246ed8c2a0a37336c541acbef071 SHA512 ecce46e1d538855c81a5c814b29240b9891b0367b45db98c1b8e9eccd724f360ca7b95da948e25d14d881eb84391dab9fd2aeef132345157d8bf7867658d98f5
+AUX bootlogd.initd 276 BLAKE2B afc0ce0406b38d9d29398f054668f78f0d90994421b3a8a1be97ea7d2f909a6675ddfbbe8aa21918acf1147bbb147c0d2465825ec13d86c82c85320f6a5d97e9 SHA512 e2e7edcd896900eb5860310af29233b29f438a5d5c07a5ab459da2ff9117cbb21c2f9b8f17f6817068c5444b4cd5d255a2197912907c1af39bdd23d1d6e10641
 AUX halt.sh 101 BLAKE2B f3b8a24b6efce0ccffeb76f401af9f9bce752a541ea646dd6d357eaaa834be2049411148ec18b591283d85f42b0c3c1e41f442ba95c5f5b4cd9e87b39a83d51e SHA512 aaf46f9c74ae58027e59f32e5e929ff6529206d07fdf4e3f17962ccbc46c68d34e4e2839019708a763dead93b83ca8f457379491830ab43d6407247fd7ac2a77
 AUX inittab-2.98-r1 2124 BLAKE2B 57e40e8410a31ec73f581e2feb142c600e2ce687745a6135961c0f1ea31e77f1acf9b9be1cf4c1d55685802a913304056cf1f137686f14d89caa9ec973d751c2 SHA512 6ce22ba933158d1a0fc7d0eaa9536b1cdcd8baa90cddfe8b1bf7a1f7292ba7fc14b6b46968848301a2e573939b4e21ce8d64bf3a9eaeb4d038de7d113fd3b9fb
 AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de6319153cce234b0d1dc7546beecf67296f8b7d6e3eb0f633d8a4ebc83fc4cc586c4f92cdb48df1f766aa4af72b0fa0e1 SHA512 6ce3adf698554d15394edbe6dbfc62822859854d503b201c9f96bd81c2a8cd249ed44229a85dd8b97f454f9311abc5792e349f5cc512ff6d5570500d88044bee
@@ -6,6 +7,6 @@ AUX sysvinit-2.94_beta-shutdown-single.patch 1261 BLAKE2B 571b7cf40ccdbb27e65b31
 AUX sysvinit-2.99-shutdown-h.patch 2684 BLAKE2B 57c27b8646a0b47f66eb103450e645fa45220a1bf79da86207ffa1393c311cb4c4a2ad9b8b7bf81cc4ae2ccb2acb19b66fd575935d8a0b0a2a9b3899c0088c9f SHA512 ef33da0d5673180275c8120c6904a4214cf1308827a626d8d6a2aab67d7d25b5407f9efcaf6a7a4a09a8c409899242943f6a95881cc8c8898b780224f991f2f7
 DIST sysvinit-2.99.tar.xz 126908 BLAKE2B b82c745d5b695f918d4a163e7b9eaceccc07a46f73c3782c7771cc29a8600be13de4ff30891086df5773d60f37fa3b0f58566ccaf72cd70af68083b51152a38b SHA512 34f328d7d2e6ceddcddfebab49eb9c34e90dc96decf2caeb89dffd2ade54322fa4a3cb9fa1e1a4bc687e07fcb0a13e5aebe6186582a9f5c9153e1513baa87ddd
 DIST sysvinit-3.00.tar.xz 127072 BLAKE2B d1c4e509d7c13cf0fb9da290f875e7c0ab0666d843d75d4dd6885112248a859dd077bdf9cc926c4af58473da99a5229bb879c7094afd648d5ebe72597a3ba6a7 SHA512 ba834ac6c48528304373018bfb05dcdd3573d8081dd7dc95a44808804404d77ee4832fedb3f34e67d87f22f201f9526c54910a51c6ed2a42ac55b756843cd825
-EBUILD sysvinit-2.99.ebuild 3959 BLAKE2B 336dab1fcea056bb9c3dfcee0b59ba42b032aa18b4645f2bea76a64c0a45dbf314a71b0c1236f6ae941dda2f26f57ab0b18c1e1c5fd43363f32878029b37bd05 SHA512 5a4ccb62aa7dc2faee89b11acd4061a6678bda65999e516349a86d50774967d6554bb94912e83b5ca6d87eebf60036abb5deef39fac471629f9542550e553d3d
-EBUILD sysvinit-3.00.ebuild 3967 BLAKE2B 48967c9bb6525586026d78474fae39c0d2aa0f1fbb6161ff1f580f35974641b494ea3510c3c503b96876e6f30c2d7219449ab0b7ff40dc624e414f006752e626 SHA512 fc41e9ef6e2d5f19d74513a0285206acf9f477b8951b1e4da6daa78fa64cb6bc78f4d1fc084dbec986b79142f2a67e91c7b74592cdd92a5abffe711535f9611d
+EBUILD sysvinit-2.99-r1.ebuild 4007 BLAKE2B ed9f8a5878284684e2602bd9ee794e981b05aaa440da676b46bf3ec65c55f70aedce19798cdaba2e144112e9774f3436379dcfcc248520a083ee396c57bcd6a8 SHA512 9c5b021dd1b5a21072cc69fe8fd132abbe563fb8550b8f5f712ca7c274f40b7d01e49d313990f0cb1f44fd651dbadc54210df87b69f8134c3eb38720fefa941c
+EBUILD sysvinit-3.00-r1.ebuild 4015 BLAKE2B fe3ff8ec0b7d65fc7642cf7fcef783023f214c88cf76b8d6d2812d8da2074650524f72fd3cdfa786b2d9f3eb99b081d30216ac7e0b3f102e233bbef3548be152 SHA512 b19fdc80ba95eaf15027601439a8991a0e3a4904048efeec6e3f47f7fde81d87eb80ce56b0d5ec773d1b0bba9191cc2a0da9b6505a7c1c70a55260e14efc5580
 MISC metadata.xml 359 BLAKE2B c5bd566a590dd04ca51751f4985840a143515fb8f7d3d21e1ad7f35b042ce578dae87e8d86a6338f7346cb50012991ccc77abfe73cbf2a4195f8d3dda04708d5 SHA512 9eec819463d81e55845eb293c5bc822748dc28bb420cfe498077d2dec6947e4762a743ddaadba34576f10275e9176347ba98711b059c429b4125258718e8290b
diff --git a/sys-apps/sysvinit/files/bootlogd.confd b/sys-apps/sysvinit/files/bootlogd.confd
new file mode 100644
index 000000000000..ac456db6ecf7
--- /dev/null
+++ b/sys-apps/sysvinit/files/bootlogd.confd
@@ -0,0 +1,2 @@
+# Put your bootlog options into this
+#BOOTLOGD_ARGS="-l /var/log/boot"
diff --git a/sys-apps/sysvinit/files/bootlogd.initd b/sys-apps/sysvinit/files/bootlogd.initd
index a42219271a80..ef238c13922b 100644
--- a/sys-apps/sysvinit/files/bootlogd.initd
+++ b/sys-apps/sysvinit/files/bootlogd.initd
@@ -1,8 +1,8 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="bootlogd - record boot messages (sysvinit)"
 pidfile="/run/bootlogd"
 command="/sbin/bootlogd"
-command_args="-p ${pidfile}"
+command_args="-p ${pidfile} ${BOOTLOGD_ARGS}"
diff --git a/sys-apps/sysvinit/sysvinit-2.99.ebuild b/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
index f370b1a50ee7..9d78abebae42 100644
--- a/sys-apps/sysvinit/sysvinit-2.99.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
@@ -110,6 +110,7 @@ src_install() {
 	doins "${WORKDIR}"/inittab
 
 	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
+	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
 	into /
 	dosbin "${FILESDIR}"/halt.sh
 
diff --git a/sys-apps/sysvinit/sysvinit-3.00.ebuild b/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild
index e2a06d6700d2..83d6e6f7635b 100644
--- a/sys-apps/sysvinit/sysvinit-3.00.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild
@@ -110,6 +110,7 @@ src_install() {
 	doins "${WORKDIR}"/inittab
 
 	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
+	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
 	into /
 	dosbin "${FILESDIR}"/halt.sh