diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-05-19 15:54:36 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-05-19 15:55:35 +0200 |
| commit | 6015d0cc954143cf4962881b91e38ae6912d94ef (patch) | |
| tree | 9eba0780a3d77ca52e70eff8394af42f39a011d5 | |
| parent | b4757511525f39fd8120d84a803bb8a7834dcc61 (diff) | |
| download | aports-6015d0cc954143cf4962881b91e38ae6912d94ef.tar.bz2 aports-6015d0cc954143cf4962881b91e38ae6912d94ef.tar.xz | |
main/alpine-conf: fix cciss devices
ref #2893
| -rw-r--r-- | main/alpine-conf/0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch | 26 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 12 |
2 files changed, 34 insertions, 4 deletions
diff --git a/main/alpine-conf/0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch b/main/alpine-conf/0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch new file mode 100644 index 0000000000..7901447a42 --- /dev/null +++ b/main/alpine-conf/0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch @@ -0,0 +1,26 @@ +From dc06856daff9ba68eea716956c2e2383d4097747 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon, 19 May 2014 15:50:21 +0200 +Subject: [PATCH] setup-disk: fix partitioning of HP raid array (cciss) + +ref #2893 +--- + setup-disk.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup-disk.in b/setup-disk.in +index e5cae87..e7a063c 100644 +--- a/setup-disk.in ++++ b/setup-disk.in +@@ -950,7 +950,7 @@ if [ $# -gt 0 ]; then + echo "$i is not a suitable for partitioning" + exit 1 + fi +- diskdevs="$diskdevs /dev/$j" ++ diskdevs="$diskdevs /dev/${j//!//}" + done + else + ask_disk "Which disk(s) would you like to use? (or '?' for help or 'none')" \ +-- +1.9.3 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 63f8b73ad4..8a824e4a68 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.0.1 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" license="GPL2" depends="openrc" source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz + 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -34,6 +35,9 @@ package() { done } -md5sums="905831b30cee21cbad64c2d6a0973516 alpine-conf-3.0.1.tar.xz" -sha256sums="928e37a835af314c313b85f166d51b1e2421e36191e987d0eb63aa4aa5a1b640 alpine-conf-3.0.1.tar.xz" -sha512sums="3ff48fe21dafa96cc43a71bbb227961c27f75e04a36dff7c0e2b8f5a6541e63156f692bd50e67f16f2c833b88a671327525f8d1f040dd1fd2982d341589bf309 alpine-conf-3.0.1.tar.xz" +md5sums="905831b30cee21cbad64c2d6a0973516 alpine-conf-3.0.1.tar.xz +df0d66fd6dcd63f1648b0768ed23df34 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch" +sha256sums="928e37a835af314c313b85f166d51b1e2421e36191e987d0eb63aa4aa5a1b640 alpine-conf-3.0.1.tar.xz +56988a30777e6a7ed0391236aa94d3812ab4b9ee89a7866ce62ab4eb620145f2 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch" +sha512sums="3ff48fe21dafa96cc43a71bbb227961c27f75e04a36dff7c0e2b8f5a6541e63156f692bd50e67f16f2c833b88a671327525f8d1f040dd1fd2982d341589bf309 alpine-conf-3.0.1.tar.xz +6188cfe76b6acd63c9c9906f590c025ea4d0d8b49c97c0c21dee93670fafda595668534b7fcbbe5095eae967d13fb742823fe1c69412f52341c18e3f5ea7901e 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch" |