diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-05-19 13:56:16 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-05-19 13:57:57 +0000 |
| commit | 1c6ff8787ff33ad7eb3a091e8f490ac4501ce788 (patch) | |
| tree | 194442c62515d29fa238194b11e46e6ce9386ba5 | |
| parent | 28cd2b2de94e0bd8c5f2adf688ba862d06183283 (diff) | |
| download | aports-1c6ff8787ff33ad7eb3a091e8f490ac4501ce788.tar.bz2 aports-1c6ff8787ff33ad7eb3a091e8f490ac4501ce788.tar.xz | |
main/alpine-conf: backport HP array (cciss) paritioning fix
fixes #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 588092909e..66b5a0be0b 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=2.14.0 -pkgrel=3 +pkgrel=4 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" @@ -10,6 +10,7 @@ depends="openrc" source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz 0001-setup-bootable-use-UUID-on-new-USBs.patch 0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch + 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -38,10 +39,13 @@ package() { md5sums="94b82dd9d7a2c63aa6909238da3b44b3 alpine-conf-2.14.0.tar.xz c0eeeebfb67b757c954a2f5100461a7b 0001-setup-bootable-use-UUID-on-new-USBs.patch -6568923677063d92939f85157baf0dc4 0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch" +6568923677063d92939f85157baf0dc4 0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch +df0d66fd6dcd63f1648b0768ed23df34 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch" sha256sums="14dc81845b16ffcbb39af9d0c5aeffab68166eec154c822b7c1c9c0697823d5b alpine-conf-2.14.0.tar.xz 754a59868f069c4eb2321034f00539ea02e734ede1a483b9c9ec5360c788f8c1 0001-setup-bootable-use-UUID-on-new-USBs.patch -a410da99de3ef31a7a8a537aeb0fcd0ab53027e6febd95e15c1accdc49c135ee 0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch" +a410da99de3ef31a7a8a537aeb0fcd0ab53027e6febd95e15c1accdc49c135ee 0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch +56988a30777e6a7ed0391236aa94d3812ab4b9ee89a7866ce62ab4eb620145f2 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch" sha512sums="39aa74e676221475ce088d82b134563c3dd04a69e90919089d3876b6a4715f6df58aa156352a40d9f817414cbdb603350a3e9c15914fb254a24d8cef4acd6581 alpine-conf-2.14.0.tar.xz 3b2d2fb754421f7dd4c45c7212544c2f34587da9da10e777ee9de153dd77e70d016bf8b270d72dd6ee8299c99a17f2969bddef586afbdcac13b4d76c87bcc35e 0001-setup-bootable-use-UUID-on-new-USBs.patch -32bc771eba2b912623dd5b0c96571d0770afc370c354831353f2ebda5e396323f1cebfddc36d8ac3ee8028a1554a0163ecdaa9cca108097002282f838139f5b6 0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch" +32bc771eba2b912623dd5b0c96571d0770afc370c354831353f2ebda5e396323f1cebfddc36d8ac3ee8028a1554a0163ecdaa9cca108097002282f838139f5b6 0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch +6188cfe76b6acd63c9c9906f590c025ea4d0d8b49c97c0c21dee93670fafda595668534b7fcbbe5095eae967d13fb742823fe1c69412f52341c18e3f5ea7901e 0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch" |