diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2017-03-20 22:17:19 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2017-03-20 22:17:27 +0200 |
| commit | e600c084bdf6736681e1e14d66b77c1558eb5835 (patch) | |
| tree | 074b2433593d511462549ccdd9a06f7b164e4c27 /main/openrc | |
| parent | 6d539efc7cd7c6d419ebde10c222be8f3f04938b (diff) | |
| download | aports-e600c084bdf6736681e1e14d66b77c1558eb5835.tar.bz2 aports-e600c084bdf6736681e1e14d66b77c1558eb5835.tar.xz | |
main/openrc: fix re-mounting root file system
fixes #7042
Diffstat (limited to 'main/openrc')
| -rw-r--r-- | main/openrc/0002-force-root-be-rw-before-localmount.patch | 14 | ||||
| -rw-r--r-- | main/openrc/APKBUILD | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/main/openrc/0002-force-root-be-rw-before-localmount.patch b/main/openrc/0002-force-root-be-rw-before-localmount.patch index be530bf4ed..1c9f12c1a3 100644 --- a/main/openrc/0002-force-root-be-rw-before-localmount.patch +++ b/main/openrc/0002-force-root-be-rw-before-localmount.patch @@ -1,23 +1,25 @@ -From 20603f90e49d0000babe6529a5d9b567b4e5f6b0 Mon Sep 17 00:00:00 2001 +From 228df9f1f21e08ec659d5fcf1f716393e563a3a5 Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Wed, 1 Feb 2017 04:05:44 +0000 Subject: [PATCH 2/7] force root be rw before localmount The service that pulls in root remount is mtab which we dont need/use. --- - init.d/localmount.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + init.d/localmount.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/init.d/localmount.in b/init.d/localmount.in -index 9c8da2d0..3dbb375b 100644 +index 9c8da2d0..c349c951 100644 --- a/init.d/localmount.in +++ b/init.d/localmount.in -@@ -14,8 +14,8 @@ description="Mounts disks and swap according to /etc/fstab." +@@ -13,9 +13,9 @@ description="Mounts disks and swap according to /etc/fstab." + depend() { - need fsck +- need fsck - use lvm modules mtab root - after lvm modules root ++ need fsck root + use lvm modules mtab + after lvm modules keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index 7435bb562d..89b17d3005 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD @@ -2,7 +2,7 @@ pkgname=openrc pkgver=0.24.1 _ver=${pkgver/_git*/} -pkgrel=0 +pkgrel=1 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" arch="all" @@ -72,7 +72,7 @@ package() { sha512sums="8d2aec029cb675ae5d446fe4a2f9613fac2fc5ea74b091d93e62b1f7bd4f8e3a96893bafa39a301129dad4623cc30acdcfd9e383a74f98c69f29820adb6d9aa0 openrc-0.24.1.tar.gz 71fce711adbcb411189a089f1d49567c50348e12c42b7a9c9b582dae5d18051f88ccf81c768337e87d6792d953e84d1e8b93d7978a1947d7d20ef3b1cd330875 0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch -e6b5d88929feecfa6b8c283ebaae6c2b620d4d8c5ac65a0d4b8d015079bab042fef6b4809140336f3b56e2d238f62805ae73406ff12e89c70a09bc941729a3d2 0002-force-root-be-rw-before-localmount.patch +aedf77f9159fefb4bd5f30a29a33b6aedbc986c9a0f993aa928cc79fbe24aac76bd9e5974dcce52ee8736c22d7e90375930d4bb5c66af3519d8e46590df00fe1 0002-force-root-be-rw-before-localmount.patch 9dea3fcdb90e3e8078a771beefeba3ca91b9966a1b8ee9ff96cf460e7dd21abbc4a46a501a960c3edf5a76c083c2cf60ccb06d9da7a4c6df2a50660745beb278 0003-sysctl-add-compatibility-for-busybox-sysctl.patch d54630d40a2d6b10a325cb012d4efcda997a60c008ca953ce5d60059d3f267308a59dabddf93a5fc0d301aa91967137d144effbe5f574394af768ce4ebc48738 0004-hide-error-when-migrating-var-run-to-run.patch 39a35c54ec9112fe84c901ed155a711cec8e194af02d5483ee60b80743dab12391e6fdc7b3da2f86844dd4edcf53e681ff95bd4d6fa1101a89ce54dce2ddbb7c 0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch |