diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-02-13 17:14:53 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-02-14 11:57:01 +0000 |
| commit | 43d7bb60e7f4c525b13bb2b5842ef65b73ece26c (patch) | |
| tree | 48ca1f8d9bbcbe6aa884c9b6992d7cd6c88fd39b /main | |
| parent | 5ffd9b46d64ad0c31abf77cba2e9a4e1dcd76067 (diff) | |
| download | aports-43d7bb60e7f4c525b13bb2b5842ef65b73ece26c.tar.bz2 aports-43d7bb60e7f4c525b13bb2b5842ef65b73ece26c.tar.xz | |
main/alpine-conf: setup-disk boot fix for mdadm-3.1.1
fixes #277
Diffstat (limited to 'main')
| -rw-r--r-- | main/alpine-conf/0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch | 36 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 13 |
2 files changed, 46 insertions, 3 deletions
diff --git a/main/alpine-conf/0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch b/main/alpine-conf/0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch new file mode 100644 index 000000000..f5ed92a94 --- /dev/null +++ b/main/alpine-conf/0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch @@ -0,0 +1,36 @@ +From d2dd5ae63d2d5e598dd76d075ea998b4d3062f13 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Sat, 13 Feb 2010 15:25:39 +0000 +Subject: [PATCH] setup-disk: boot fix for mdadm-3.1.1 + +mdadm 3.1.1 switched to use metadata 1.1 by default. This does not work +with extlinux so we set metadata to old default manually for /boot. +--- + setup-disk.in | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/setup-disk.in b/setup-disk.in +index a6b9efa..a81172a 100644 +--- a/setup-disk.in ++++ b/setup-disk.in +@@ -327,13 +327,15 @@ EOF + local p= rd= + for p in $(sfdisk -l $rootdisk_dev 2>/dev/null \ + | awk '/Linux raid/ {print $1}'); do ++ local opt="--metadata=0.90" + case "$p" in + *1) rd=/dev/md0; boot_dev=/dev/md0;; +- *2) rd=/dev/md1; swap_dev=/dev/md1;; ++ *2) rd=/dev/md1; swap_dev=/dev/md1 ++ opt= ;; + *3) rd=/dev/md2; root_dev=/dev/md2;; + esac + mdadm --create $rd --level=1 --raid-devices=2 \ +- --quiet --run $p missing ++ $opt --quiet --run $p missing + done + else + local p= +-- +1.6.6.1 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 06e26daba..26590feca 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,14 +1,20 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=2.1 -pkgrel=0 +pkgrel=1 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" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 + 0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch" license="GPL-2" _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + patch -p1 -i "$srcdir"/0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch +} + build() { cd "$_builddir" make || return 1 @@ -21,4 +27,5 @@ package() { ln -s lbu "$pkgdir"/sbin/lbu_$i done } -md5sums="d9b13b849abbe5f2061aa8af0c4ac7ce alpine-conf-2.1.tar.bz2" +md5sums="d9b13b849abbe5f2061aa8af0c4ac7ce alpine-conf-2.1.tar.bz2 +be3e55fd58e798ec3a235d7220b31811 0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch" |