aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2017-10-23 14:46:53 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2017-10-23 14:48:48 +0000
commit131105ff61d3bf6272f1fee753fef42f0147eff8 (patch)
tree7c19b2279eedc12b739b01e6c2647edd3e037a81
parent484c933aed265b2df407384292db1dcafa8d713d (diff)
downloadaports-131105ff61d3bf6272f1fee753fef42f0147eff8.tar.bz2
aports-131105ff61d3bf6272f1fee753fef42f0147eff8.tar.xz
main/alpine-baselayout: fix pre-upgrade script
we also use realtive symlink to suppose nested rootfs
-rw-r--r--main/alpine-baselayout/APKBUILD2
-rw-r--r--main/alpine-baselayout/alpine-baselayout.pre-upgrade4
2 files changed, 3 insertions, 3 deletions
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index 985e231d4c..46019b235b 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-baselayout
pkgver=3.0.5
-pkgrel=1
+pkgrel=2
pkgdesc="Alpine base dir structure and init scripts"
url="http://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
arch="all"
diff --git a/main/alpine-baselayout/alpine-baselayout.pre-upgrade b/main/alpine-baselayout/alpine-baselayout.pre-upgrade
index e2dd88c46d..ec139ec784 100644
--- a/main/alpine-baselayout/alpine-baselayout.pre-upgrade
+++ b/main/alpine-baselayout/alpine-baselayout.pre-upgrade
@@ -16,9 +16,9 @@ done
# migrate /var/run directory to /run
if [ -d /var/run ]; then
- cp -a /var/run/* 2>/dev/null
+ cp -a /var/run/* /run 2>/dev/null
rm -rf /var/run
- ln -s /run /var/run
+ ln -s ../run /var/run
fi
addgroup -S -g 42 shadow 2>/dev/null