main/alpine-conf: fix issue when for it on lvm on cciss raid

fixes #4421

(cherry picked from commit f06947663b0d988c62c583e121839c62a75c775a)

2 files changed, 53 insertions, 4 deletions

diff --git a/main/alpine-conf/0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch b/main/alpine-conf/0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch
new file mode 100644
index 0000000000..273814e52d
--- /dev/null
+++ b/main/alpine-conf/0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch
@@ -0,0 +1,45 @@
+From bf182e3346ef7aa42b7db5c9d7fbc431e78269e3 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 1 Jul 2015 14:17:07 +0000
+Subject: [PATCH] setup-disk: add raid to initfs if root is on lvm
+
+ref #4421
+---
+ setup-disk.in | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/setup-disk.in b/setup-disk.in
+index 9444b7e..e2798f9 100644
+--- a/setup-disk.in
++++ b/setup-disk.in
+@@ -234,6 +234,14 @@ install_mounted_root() {
+        # check if our root is on raid so we can feed mkinitfs and
+        # update-exlinux.conf with the proper kernel module params
+        for dev in $rootdev $pvs; do
++
++               # check if we need hardware raid drivers
++               case $dev in
++               /dev/cciss/*)
++                       initfs_features="${initfs_features% raid} raid"
++                       ;;
++               esac
++
+                [ -e "/sys/block/${dev#/dev/}/md" ] || continue
+ 
+                local md=${dev#/dev/}
+@@ -245,12 +253,6 @@ install_mounted_root() {
+                esac
+        done
+ 
+-       # check if we need hardware raid drivers
+-       case $rootdev in
+-               /dev/cciss/*)
+-                       initfs_features="${initfs_features% raid} raid"
+-                       ;;
+-       esac
+ 
+        if [ -n "$VERBOSE" ]; then
+                echo "Root device:     $rootdev"
+-- 
+2.4.5
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 88280e2bcd..fe05f82c3a 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,13 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
 pkgver=3.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 arch="all"
 license="GPL2"
 depends="openrc>0.13"
 source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
+        0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch
         "
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -34,6 +35,9 @@ package() {
         done
 }
 
-md5sums="d8863487539eb41de219303addf71aa1  alpine-conf-3.2.1.tar.xz"
-sha256sums="f0e7954bb1a5144f551694acfde818bbad4e42a575e7a8e3a06a777ade7a5d9d  alpine-conf-3.2.1.tar.xz"
-sha512sums="20c11b134234708d86fe4cc093c4073df3496a43d13994d0df369066afed39a9a3c97cebacdbb6518f212e414c9456c31ee41bd600b3fc29e892448118a7b5e8  alpine-conf-3.2.1.tar.xz"
+md5sums="d8863487539eb41de219303addf71aa1  alpine-conf-3.2.1.tar.xz
+f2da5b6cf6e4f1c1d24b59210b172bd8  0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch"
+sha256sums="f0e7954bb1a5144f551694acfde818bbad4e42a575e7a8e3a06a777ade7a5d9d  alpine-conf-3.2.1.tar.xz
+6e532930bc263d004975fe1feac115f17452e9f80b5efb22f538e7ebcbb6636d  0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch"
+sha512sums="20c11b134234708d86fe4cc093c4073df3496a43d13994d0df369066afed39a9a3c97cebacdbb6518f212e414c9456c31ee41bd600b3fc29e892448118a7b5e8  alpine-conf-3.2.1.tar.xz
+cd2c1f3adef443edf4473719f1cf4f277336fb59527ba70ed30f1f2c87d3cc63afe55a009b5bb5666ff79784ea8a79730dfb67a37d8e3fd8fe8fd7eb88a564fc  0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch"