summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-08-11 07:44:51 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-08-11 07:44:51 +0000
commit313b6883a2c955ea2797fb6b8632c126471463b7 (patch)
tree5c10db2c45000b17d57f6b25834fcc0066ec8f37
parentb74f8e91b88d5fd95d8dffbd63a73a5ac488a7fe (diff)
downloadaports-313b6883a2c955ea2797fb6b8632c126471463b7.tar.bz2
aports-313b6883a2c955ea2797fb6b8632c126471463b7.tar.xz
main/openrc: swap: only unmount tmpfs when shutting down
ref #711
-rw-r--r--main/openrc/APKBUILD4
-rw-r--r--main/openrc/swap-umount-tmpfs.patch17
2 files changed, 20 insertions, 1 deletions
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index ea51db3ae..d02e751ef 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -2,7 +2,7 @@
pkgname=openrc
pkgver=0.8.3
_ver=${pkgver/_git*/}
-pkgrel=2
+pkgrel=3
pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git"
arch="all"
@@ -18,6 +18,7 @@ source="http://distfiles.gentoo.org/distfiles/$pkgname-$_ver.tar.bz2
0001-sysctl-Use-dev-null-instead-of-q.patch
remove-rc_sys-warning.patch
hwclock-hctosys.patch
+ swap-umount-tmpfs.patch
hostname.initd
hwdrivers.initd
@@ -71,6 +72,7 @@ fb8baeaf32f4d53491312675f28a9939 0001-fsck-add-C0-and-T-options-unless-fsck-is-
bc4f9ccd4036f9c458b89afe877fa8c2 0001-sysctl-Use-dev-null-instead-of-q.patch
2a1749ee829877d80c3696eade59be8a remove-rc_sys-warning.patch
95927c85beb1476bda46ab8933c5e780 hwclock-hctosys.patch
+ddb34ea87994df3126f5e6b7e8f9ac93 swap-umount-tmpfs.patch
c32e15b0858eef708497e7ee6355a055 hostname.initd
b1e64885f301166df30be3e3cf5338ff hwdrivers.initd
33ca3e558c42cdd17adccbc7807298f7 keymaps.initd
diff --git a/main/openrc/swap-umount-tmpfs.patch b/main/openrc/swap-umount-tmpfs.patch
new file mode 100644
index 000000000..d68165c77
--- /dev/null
+++ b/main/openrc/swap-umount-tmpfs.patch
@@ -0,0 +1,17 @@
+diff --git a/init.d/swap.in b/init.d/swap.in
+index fef8ab3..c540bc2 100644
+--- a/init.d/swap.in
++++ b/init.d/swap.in
+@@ -24,8 +24,10 @@ stop()
+
+ # Try to unmount all tmpfs filesystems not in use, else a deadlock may
+ # occure. As $RC_SVCDIR may also be tmpfs we cd to it to lock it
+- cd "$RC_SVCDIR"
+- umount -a -t tmpfs 2>/dev/null
++ if [ "$RC_RUNLEVEL" = "shutdown" ]; then
++ cd "$RC_SVCDIR"
++ umount -a -t tmpfs 2>/dev/null
++ fi
+
+ case "$RC_UNAME" in
+ NetBSD|OpenBSD) swapctl -U -t noblk >/dev/null;;