diff options
| -rw-r--r-- | main/alpine-conf/0001-setup-disk-fix-find_disks.patch | 76 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 9 |
2 files changed, 3 insertions, 82 deletions
diff --git a/main/alpine-conf/0001-setup-disk-fix-find_disks.patch b/main/alpine-conf/0001-setup-disk-fix-find_disks.patch deleted file mode 100644 index 2b5453d6b..000000000 --- a/main/alpine-conf/0001-setup-disk-fix-find_disks.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 5572e8a3db95f179b3433e5ea5f8c6fa2c8c65ab Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 29 Sep 2009 09:40:53 +0000 -Subject: [PATCH] setup-disk: fix find_disks - -The old way did not detect ida/c0d0. The new should detect it. -We also filter out md devices. ---- - setup-disk.in | 42 ++++++++++++++++++++++++++++++++---------- - 1 files changed, 32 insertions(+), 10 deletions(-) - -diff --git a/setup-disk.in b/setup-disk.in -index d53fba1..33cc868 100644 ---- a/setup-disk.in -+++ b/setup-disk.in -@@ -146,25 +146,47 @@ find_swap_size() { - - has_mounted_part() { - local p -- # parse /proc/mounts for moutned devices -+ # parse /proc/mounts for mounted devices - for p in $(awk '$1 ~ /^\/dev\// {gsub("/dev/", "", $1); print $1}' \ - /proc/mounts); do -- if [ -e /sys/block/$1/$p ]; then -- return 0 -- fi -+ [ -e /sys/block/$1/$p ] && return 0 - done - return 1 - } - -+has_holders() { -+ local i -+ # check if device is used by any md devices -+ for i in $1/holders/* $1/*/holders/*; do -+ [ -e "$i" ] && return 0 -+ done -+ return 1 -+} -+ -+is_available_disk() { -+ local dev=$1 -+ local b=$(echo $p | sed 's:/:!:g') -+ -+ # check if its a "root" block device and not a partition -+ [ -e /sys/block/$b ] || return 1 -+ -+ # check so it does not have mounted partitions -+ has_mounted_part $dev && return 1 -+ -+ # check so its not part of an md setup -+ has_holders /sys/block/$b && return 1 -+ -+ # check so its not an md device -+ [ -e /sys/block/$b/md ] && return 1 -+ -+ return 0 -+} -+ - find_disks() { -- local p= disks= -+ local p= - for p in $(awk '$1 ~ /[0-9]+/ {print $4}' /proc/partitions); do -- b=$(echo $p | sed 's:/:!:g') -- if [ -e /sys/block/$b/device ] && ! has_mounted_part $p; then -- disks="$disks $p" -- fi -+ is_available_disk $p && echo -n " $p" - done -- echo $disks - } - - useall() { --- -1.6.4.4 - diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 0ffcb1ff1..18aa74a5b 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,18 +1,16 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf -pkgver=2.0_rc6 -pkgrel=1 +pkgver=2.0_rc7 +pkgrel=0 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname depends="openrc" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 - 0001-setup-disk-fix-find_disks.patch " license="GPL-2" build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i ../0001-setup-disk-fix-find_disks.patch || return 1 make || return 1 make install PREFIX= DESTDIR="$pkgdir" @@ -20,5 +18,4 @@ build() { ln -s lbu "$pkgdir"/sbin/lbu_$i done } -md5sums="52d08eaff7ad57581106418deed94d7d alpine-conf-2.0_rc6.tar.bz2 -cb6b8b50e4098174ce20245faeeb84ea 0001-setup-disk-fix-find_disks.patch" +md5sums="8b44c02500d646dd64368904762d236e alpine-conf-2.0_rc7.tar.bz2" |