diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-02-15 16:59:04 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-02-15 17:11:34 +0000 |
commit | b73646786d4ad36502cc05b1aba954de35d0f5b4 (patch) | |
tree | 52540a492ce6df937ca98e3b465b00cdaeefb068 | |
parent | cb3cefffe7f013a14120ceb62b47d1993d930fed (diff) | |
download | alpine_aports-1.10_rc2.tar.bz2 alpine_aports-1.10_rc2.tar.xz alpine_aports-1.10_rc2.zip |
main/alpine-conf: upgrade to 2.2v1.10_rc2
setup-disk fixes
(cherry picked from commit 43faf5accb12673ca1a6eec7d3ff59c5de626cbb)
-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 | 15 |
2 files changed, 4 insertions, 47 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 deleted file mode 100644 index f5ed92a946..0000000000 --- a/main/alpine-conf/0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From d2dd5ae63d2d5e598dd76d075ea998b4d3062f13 Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Sat, 13 Feb 2010 15:25:39 +0000 | ||
4 | Subject: [PATCH] setup-disk: boot fix for mdadm-3.1.1 | ||
5 | |||
6 | mdadm 3.1.1 switched to use metadata 1.1 by default. This does not work | ||
7 | with extlinux so we set metadata to old default manually for /boot. | ||
8 | --- | ||
9 | setup-disk.in | 6 ++++-- | ||
10 | 1 files changed, 4 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/setup-disk.in b/setup-disk.in | ||
13 | index a6b9efa..a81172a 100644 | ||
14 | --- a/setup-disk.in | ||
15 | +++ b/setup-disk.in | ||
16 | @@ -327,13 +327,15 @@ EOF | ||
17 | local p= rd= | ||
18 | for p in $(sfdisk -l $rootdisk_dev 2>/dev/null \ | ||
19 | | awk '/Linux raid/ {print $1}'); do | ||
20 | + local opt="--metadata=0.90" | ||
21 | case "$p" in | ||
22 | *1) rd=/dev/md0; boot_dev=/dev/md0;; | ||
23 | - *2) rd=/dev/md1; swap_dev=/dev/md1;; | ||
24 | + *2) rd=/dev/md1; swap_dev=/dev/md1 | ||
25 | + opt= ;; | ||
26 | *3) rd=/dev/md2; root_dev=/dev/md2;; | ||
27 | esac | ||
28 | mdadm --create $rd --level=1 --raid-devices=2 \ | ||
29 | - --quiet --run $p missing | ||
30 | + $opt --quiet --run $p missing | ||
31 | done | ||
32 | else | ||
33 | local p= | ||
34 | -- | ||
35 | 1.6.6.1 | ||
36 | |||
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 26590feca1..b9fb4e4e55 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD | |||
@@ -1,20 +1,14 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=alpine-conf | 2 | pkgname=alpine-conf |
3 | pkgver=2.1 | 3 | pkgver=2.2 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="Alpine configuration management scripts" | 5 | pkgdesc="Alpine configuration management scripts" |
6 | url=http://git.alpinelinux.org/cgit/$pkgname | 6 | url=http://git.alpinelinux.org/cgit/$pkgname |
7 | depends="openrc" | 7 | depends="openrc" |
8 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 | 8 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" |
9 | 0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch" | ||
10 | license="GPL-2" | 9 | license="GPL-2" |
11 | 10 | ||
12 | _builddir="$srcdir"/$pkgname-$pkgver | 11 | _builddir="$srcdir"/$pkgname-$pkgver |
13 | prepare() { | ||
14 | cd "$_builddir" | ||
15 | patch -p1 -i "$srcdir"/0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch | ||
16 | } | ||
17 | |||
18 | build() { | 12 | build() { |
19 | cd "$_builddir" | 13 | cd "$_builddir" |
20 | make || return 1 | 14 | make || return 1 |
@@ -27,5 +21,4 @@ package() { | |||
27 | ln -s lbu "$pkgdir"/sbin/lbu_$i | 21 | ln -s lbu "$pkgdir"/sbin/lbu_$i |
28 | done | 22 | done |
29 | } | 23 | } |
30 | md5sums="d9b13b849abbe5f2061aa8af0c4ac7ce alpine-conf-2.1.tar.bz2 | 24 | md5sums="3baf2baa7effc0b1928e757f45357d4d alpine-conf-2.2.tar.bz2" |
31 | be3e55fd58e798ec3a235d7220b31811 0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch" | ||