diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-01-02 12:44:19 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-01-02 12:44:19 +0000 |
| commit | cc77d4d5085c335e02f69a7dcdbbb3f195ec5536 (patch) | |
| tree | 22aebc07a6e370561f3c1406263896fac5e19afc | |
| parent | eba4f64c1aa1fac8000e97313f22c90c4a135aec (diff) | |
| download | aports-cc77d4d5085c335e02f69a7dcdbbb3f195ec5536.tar.bz2 aports-cc77d4d5085c335e02f69a7dcdbbb3f195ec5536.tar.xz | |
core/alpine-baselayout: upgrade to 1.13
fix modloop script so it can mount modloop from initramfs
| -rw-r--r-- | core/alpine-baselayout/APKBUILD | 9 | ||||
| -rw-r--r-- | core/alpine-baselayout/modloop.initd | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/core/alpine-baselayout/APKBUILD b/core/alpine-baselayout/APKBUILD index 9a82b30c49..867d1ebcb6 100644 --- a/core/alpine-baselayout/APKBUILD +++ b/core/alpine-baselayout/APKBUILD @@ -1,5 +1,6 @@ pkgname=alpine-baselayout -pkgver=1.12.1 +pkgver=1.13 +pkgrel=0 pkgdesc="Alpine base dir structure and init scripts" url=http://dev.alpinelinux.org/alpine/alpine-baselayout depends="uclibc" @@ -53,10 +54,10 @@ build() { echo "deadline-iosched" > $pkgdir/etc/modules echo "af_packet" >> $pkgdir/etc/modules - cp $srcdir/modloop.initd $pkgdir/etc/init.d/modloop + install -m 755 $srcdir/modloop.initd $pkgdir/etc/init.d/modloop } -md5sums="d11dd18253e4c4609012517912c7bd69 alpine-baselayout-1.12.1.tar.gz -20829b8111829da1441da95cb5370ddf modloop.initd +md5sums="76247daeb45cf873069ef7363d69e2a8 alpine-baselayout-1.13.tar.gz +efbd287e04739c65d5ee4f308d31c3c9 modloop.initd bcb24ca480935cb11116a6512f07fa63 install-D.patch" diff --git a/core/alpine-baselayout/modloop.initd b/core/alpine-baselayout/modloop.initd index 3f915c1a9b..b3be62ba1e 100644 --- a/core/alpine-baselayout/modloop.initd +++ b/core/alpine-baselayout/modloop.initd @@ -33,8 +33,10 @@ start() { fi &&\ mount -o loop,ro -t cramfs $CMG /.modloop rc=$? - ln -sf /.modloop/modules /lib - ln -sf /.modloop/firmware /lib + if [ "$rc" = 0 ]; then + rm -rf /lib/modules + ln -sf /.modloop/modules /lib + fi eend $rc else ebegin "Skipping mount media with modules (specify with alpine_dev)" |