summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-11-08 09:24:18 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-11-08 09:24:18 +0000
commitdca7d568c2d08256d90b14680e8dd38c60c79390 (patch)
treee79476a84a204efb1cd997efc38fb40bd0c8d68e
parent362d0e1b2422ad492460ac3628f4cc6b3b6dfc46 (diff)
downloadaports-dca7d568c2d08256d90b14680e8dd38c60c79390.tar.bz2
aports-dca7d568c2d08256d90b14680e8dd38c60c79390.tar.xz
main/alpine-conf: setup-disk: fix booting from cciss devices
-rw-r--r--main/alpine-conf/0001-setup-disk-fix-booting-from-cciss-devices.patch31
-rw-r--r--main/alpine-conf/APKBUILD6
2 files changed, 35 insertions, 2 deletions
diff --git a/main/alpine-conf/0001-setup-disk-fix-booting-from-cciss-devices.patch b/main/alpine-conf/0001-setup-disk-fix-booting-from-cciss-devices.patch
new file mode 100644
index 000000000..ff04c5d44
--- /dev/null
+++ b/main/alpine-conf/0001-setup-disk-fix-booting-from-cciss-devices.patch
@@ -0,0 +1,31 @@
+From 631c361640d22e40d19b43d3b1e63b4da84ad18a Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 8 Nov 2011 09:22:53 +0000
+Subject: [PATCH] setup-disk: fix booting from cciss devices
+
+---
+ setup-disk.in | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/setup-disk.in b/setup-disk.in
+index a2b610f..6f49e6a 100644
+--- a/setup-disk.in
++++ b/setup-disk.in
+@@ -206,6 +206,14 @@ install_mounted_root() {
+ raid[456]) raidmod="$raidmod,raid456";;
+ esac
+ done
++
++ # check if we need hardware raid drivers
++ case $rootdev in
++ /dev/cciss/*)
++ initfs_features="$(echo $initfs_features | sed 's/raid//') raid"
++ ;;
++ esac
++
+ if [ -n "$VERBOSE" ]; then
+ echo "Root device: $rootdev"
+ echo "Root filesystem: $root_fs"
+--
+1.7.7.2
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 1ab67ce9b..ed2dabfd9 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,12 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=2.9.3
-pkgrel=1
+pkgrel=2
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-compaq-server-disk-arrays-dev-cciss-c.patch
+ 0001-setup-disk-fix-booting-from-cciss-devices.patch
"
arch="all"
@@ -38,4 +39,5 @@ package() {
done
}
md5sums="5252c8ff669b91f0c7a5cbdf0b9b7552 alpine-conf-2.9.3.tar.bz2
-35287e6f69886ebfd762be07737943a2 0001-setup-disk-fix-compaq-server-disk-arrays-dev-cciss-c.patch"
+35287e6f69886ebfd762be07737943a2 0001-setup-disk-fix-compaq-server-disk-arrays-dev-cciss-c.patch
+1594f8b3a3e27bffa83a1632b49f4d6d 0001-setup-disk-fix-booting-from-cciss-devices.patch"