diff options
| -rw-r--r-- | main/openrc/0009-dont-overwrite-empty-supervise_daemon_args.patch | 40 | ||||
| -rw-r--r-- | main/openrc/APKBUILD | 12 | ||||
| -rw-r--r-- | main/openrc/remount-root.patch | 42 |
3 files changed, 3 insertions, 91 deletions
diff --git a/main/openrc/0009-dont-overwrite-empty-supervise_daemon_args.patch b/main/openrc/0009-dont-overwrite-empty-supervise_daemon_args.patch deleted file mode 100644 index 4716d06a357..00000000000 --- a/main/openrc/0009-dont-overwrite-empty-supervise_daemon_args.patch +++ /dev/null @@ -1,40 +0,0 @@ -Patch-Source: https://github.com/OpenRC/openrc/pull/558 --- -From a2f1d65f1646e5f539e986f22964cf078ba58fce Mon Sep 17 00:00:00 2001 -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Sun, 6 Nov 2022 02:14:26 +0100 -Subject: [PATCH] supervise-daemon: don't overwrite empty supervise_daemon_args - -If supervise_daemon_args is not set *or empty*, it defaults to -`start_stop_daemon_args`. This is bad because supervise-daemon doesn't -accept the same options as `start-stop-daemon`. So if we set e.g. -`start_stop_daemon_args="--wait 50"`, but not `supervise_daemon_args`, -and the user adds `supervisor=supervise-daemon` to the corresponding -/etc/conf.d/<service> file, the service will fail to start due to -unrecognized option "wait". - -It would be best to remove this fallback, but that might break some -existing scripts that depend on it. So this commit just changes it to -use `start_stop_daemon_args` as the default for `supervise_daemon_args` -only if `supervise_daemon_args` is not set at all, but not if it's -empty. - -This at least simplifies workarounds; we can just add -`supervise_daemon_args="$supervise_daemon_args"` to init scripts. ---- - sh/supervise-daemon.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sh/supervise-daemon.sh b/sh/supervise-daemon.sh -index 8d2d6faff..8eb98a17a 100644 ---- a/sh/supervise-daemon.sh -+++ b/sh/supervise-daemon.sh -@@ -41,7 +41,7 @@ supervise_start() - ${no_new_privs:+--no_new_privs} \ - ${command_user+--user} $command_user \ - ${umask+--umask} $umask \ -- ${supervise_daemon_args:-${start_stop_daemon_args}} \ -+ ${supervise_daemon_args-${start_stop_daemon_args}} \ - $command \ - -- $command_args $command_args_foreground - rc=$? diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index 5234dea7622..5cded6fa650 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openrc -pkgver=0.45.2 +pkgver=0.46 _ver=${pkgver/_git*/} -pkgrel=7 +pkgrel=0 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="https://github.com/OpenRC/openrc" arch="all" @@ -26,10 +26,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve 0006-Add-support-for-starting-services-in-a-specified-VRF.patch 0007-Clean-up-staticroute-config-remove-irrelevant-parts-.patch 0008-bootmisc-switch-wipe_tmp-setting-to-no-by-default.patch - 0009-dont-overwrite-empty-supervise_daemon_args.patch - $pkgname-grep-3.8.patch::https://github.com/OpenRC/openrc/commit/9380347f042f7d294317f4420b648422817eb75a.patch - remount-root.patch supervise-daemon-defaults.patch sysctl-readme.patch @@ -147,7 +144,7 @@ _agetty_openrc() { } sha512sums=" -ca2958772240f6e5037e39db1ee62a81091a2efa654da967f68e03a721868c6c0a41d32a2bddf55c8eadbc9bf5837b710cc2e4564844a7fbc0e585366da4fdf9 openrc-0.45.2.tar.gz +7c837e4b553511f0621944222ca0d35bd553a9888bd482ca0f8f3d2923d5b51cbd1f1c2f33cccb26d9f13dfb488939b95064673bedb7fcbf78d68664df2678c7 openrc-0.46.tar.gz 257861f5f0562e9b9a9fccebae474bd75c4bb51f005a2b8132fd551f061f65863de46c5bc4437f137b4a9d3ca741f9de9274bfa7b418eda70497ed4b5fd3056d 0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch 3f47b4f7e6c5b7fb53ff8a13470fbada67f7470e5eba71a683e6c022162c3905f560d561c3d61698e3fde367d6ae715edf76e99949f52a22a3bbf79debc33f64 0002-fsck-don-t-add-C0-to-busybox-fsck.patch 0bd69d9e8e9c321a5e67cf924be07b9dd0b58801143c18f74bebf442958fc878e46a65f07cc2842566a8c3434e788ef3ca0c90c607de6b10931f01324bfc1b11 0003-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch @@ -156,9 +153,6 @@ ca2958772240f6e5037e39db1ee62a81091a2efa654da967f68e03a721868c6c0a41d32a2bddf55c 8bf00b82d7fc0eb1b529ec735009f91d277141ba7e5c04e23d10bbcf36eb453f0b31d48aec45e50b5be4c14f611acc4454933f3cefdf8beab07d851328223464 0006-Add-support-for-starting-services-in-a-specified-VRF.patch 431ac28808e684bea5511386bf5f06efe7f509f1dbe7e15ae6309563d813deae8f3edd872a0943ef8088e3cf778d7bc5ebd15a893dc4a08f4022b7a56bbafc63 0007-Clean-up-staticroute-config-remove-irrelevant-parts-.patch 475f4ea63b9b5d7eb9c623e96b6cc3d3072abcb7194d0045b84e0688836c8514fccfc68b0eae0b4bee60878cdea8042c3ce7e48406ee7a2f0e4a3e128a153468 0008-bootmisc-switch-wipe_tmp-setting-to-no-by-default.patch -7bdd5e97186fd9c9d17d3d9a19e16f8432e0abc27b067d2191c8038d3c32c5502ee0b5b6d539bc3550400cba63b6bccfcca05a7a3b95e352ea692b6a1be8000e 0009-dont-overwrite-empty-supervise_daemon_args.patch -0a19a00af670e38742cea8e7f59a8ef329cc2fe7f57582ce8dcd0bfb90f7b5116cc0e64a6138f56c1c20c35354f835d1638bd14d6d2ebef2e5b4332a12ec8021 openrc-grep-3.8.patch -5e60f2ea652349d716646ccf05b13a510e5797daafc5e491dd35cc3850c543a7e7499a70956f91f30702c524989386d6e08735d7ad9b7bda5ff0c2c249d52cf8 remount-root.patch 1323a8476580f7b56a9cf1b24b26b10da76c5916cf23d7dab01f08a3261751341dfe01d1ed884df8e6ea17ff6a52021cc40fb3101e99b77d4ae7f3f61ee330e8 supervise-daemon-defaults.patch 903ff555275a67ff08da91badb55d9fa6c6a2901e8ef09ca8366bd74d69757491c8336347f04551268ecf053c8ae974f50decd869926894dd94e382008e3e925 sysctl-readme.patch 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec openrc.logrotate diff --git a/main/openrc/remount-root.patch b/main/openrc/remount-root.patch deleted file mode 100644 index ae4f5b61574..00000000000 --- a/main/openrc/remount-root.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 489413c913af0708e9cfad987d6b3385d904e1ee Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net> -Date: Mon, 20 Jun 2022 19:04:49 +0200 -Subject: [PATCH] init.d/root: also remount / with options provided in - /etc/fstab - -Without this commit, the root OpenRC service remounts all mounted -filesystems (except /) with the options defined in /etc/fstab via -fstabinfo. It is presently unclear to me why / was excluded from -remounting in 497ff7ee41168d863971efb52e2ca6b42f765832 and unfortunately -neither the commit nor the associated Bugzilla issue [1] provides -further information on this. - -At Alpine, our initramfs does currently not remount / with all options -defined in /etc/fstab [2]. As part of the discussion on the Alpine side -of things we wondered why OpenRC does not remount / since this would be -the easier solution for us. For this reason, this commit changes the -behavior of the OpenRC root services accordingly to also remount / with -the options defined in /etc/fstab. - -[1]: https://bugs.gentoo.org/401573 -[2]: https://gitlab.alpinelinux.org/alpine/mkinitfs/-/merge_requests/103 -This fixes #533. ---- - init.d/root.in | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/init.d/root.in b/init.d/root.in -index 045bcd0f..2f7d82f2 100644 ---- a/init.d/root.in -+++ b/init.d/root.in -@@ -49,9 +49,7 @@ start() - local mountpoint - for mountpoint in $(fstabinfo); do - case "${mountpoint}" in -- /) -- ;; -- /*) -+ /*) # Don't remount swap etc. - mountinfo -q "${mountpoint}" && \ - fstabinfo --remount "${mountpoint}" - ;; |