summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-04-19 12:24:48 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-04-19 12:26:36 +0000
commit57d682c40381668ba64b3249820c1d9a9c0a8428 (patch)
tree06f8a40c35a121f5980eed4e11a96cfecfbdf02b
parent16de7fb39f0e327b98454b0655e10166b524eff6 (diff)
downloadaports-57d682c40381668ba64b3249820c1d9a9c0a8428.tar.bz2
aports-57d682c40381668ba64b3249820c1d9a9c0a8428.tar.xz
main/alpine-baselayout: fix previous commit
we should install the compat rc{L,S} scripts if vserver
-rw-r--r--main/alpine-baselayout/APKBUILD3
-rw-r--r--main/alpine-baselayout/alpine-baselayout.post-upgrade4
2 files changed, 3 insertions, 4 deletions
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index 66edd075d..e400fd9c1 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-baselayout
pkgver=2.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="Alpine base dir structure and init scripts"
url=http://git.alpinelinux.org/cgit/alpine-baselayout
depends=
@@ -27,7 +27,6 @@ build() {
package() {
cd "$_builddir"
make install PREFIX= DESTDIR="$pkgdir" || return 1
- mkdir "$pkgdir"/run
rm -rf "$pkgdir"/etc/issue "$pkgdir"/usr/share/udhcpc \
"$pkgdir"/etc/init.d/vlan
}
diff --git a/main/alpine-baselayout/alpine-baselayout.post-upgrade b/main/alpine-baselayout/alpine-baselayout.post-upgrade
index 0010c9bbc..6a4918e91 100644
--- a/main/alpine-baselayout/alpine-baselayout.post-upgrade
+++ b/main/alpine-baselayout/alpine-baselayout.post-upgrade
@@ -21,8 +21,8 @@ __EOF__
}
# create compat start/stop scripts for vserver guests
-if [ "$(/sbin/rc --sys)" != "VSERVER" ]; then
- # create rcL and rcK|
+if [ "$(/sbin/rc --sys)" = "VSERVER" ]; then
+ # create rcL and rcK
if ! [ -e /etc/init.d/rcL ]; then
create_vserver_startstop > /etc/init.d/rcL
fi