diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-11 08:06:03 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-11 08:07:43 +0000 |
commit | 98bf351bafa4258da0f7f2989963613cc6e17291 (patch) | |
tree | 6af1872e5698893c808a2882093b5c268cd33886 | |
parent | 313b6883a2c955ea2797fb6b8632c126471463b7 (diff) | |
download | alpine_aports-98bf351bafa4258da0f7f2989963613cc6e17291.tar.bz2 alpine_aports-98bf351bafa4258da0f7f2989963613cc6e17291.tar.xz alpine_aports-98bf351bafa4258da0f7f2989963613cc6e17291.zip |
main/alpine-conf: upgrade to 2.8.2
ref #687
ref #713
-rw-r--r-- | main/alpine-conf/0003-setup-disk-fix-data-only-mode-with-no-lvm-and-no-rai.patch | 28 | ||||
-rw-r--r-- | main/alpine-conf/APKBUILD | 10 |
2 files changed, 4 insertions, 34 deletions
diff --git a/main/alpine-conf/0003-setup-disk-fix-data-only-mode-with-no-lvm-and-no-rai.patch b/main/alpine-conf/0003-setup-disk-fix-data-only-mode-with-no-lvm-and-no-rai.patch deleted file mode 100644 index 69fa9a1c2f..0000000000 --- a/main/alpine-conf/0003-setup-disk-fix-data-only-mode-with-no-lvm-and-no-rai.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 6dbbe28a459e79acb9e7ba44d43295df9a0f45f8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Tue, 7 Jun 2011 14:17:30 +0000 | ||
4 | Subject: [PATCH 3/3] setup-disk: fix data-only mode with no lvm and no raid | ||
5 | |||
6 | ref #678 | ||
7 | --- | ||
8 | setup-disk.in | 4 ++-- | ||
9 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/setup-disk.in b/setup-disk.in | ||
12 | index 9d073ec..026e32a 100644 | ||
13 | --- a/setup-disk.in | ||
14 | +++ b/setup-disk.in | ||
15 | @@ -612,8 +612,8 @@ data_only_disk_install_lvm() { | ||
16 | |||
17 | data_only_disk_install() { | ||
18 | local diskdev= | ||
19 | - local var_dev=/dev/$vgname/lv_var | ||
20 | - local var_part_type="8e" | ||
21 | + local var_dev= | ||
22 | + local var_part_type="83" | ||
23 | local swap_part_type=82 | ||
24 | local size= | ||
25 | local swap_dev= var_dev= | ||
26 | -- | ||
27 | 1.7.5.4 | ||
28 | |||
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index bb86f65dad..971490ef9e 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD | |||
@@ -1,14 +1,13 @@ | |||
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.8.1 | 3 | pkgver=2.8.2 |
4 | pkgrel=2 | 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.git/snapshot/$pkgname-$pkgver.tar.bz2 | 8 | source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2 |
9 | 0001-setup-xorg-base-initial-commit.patch | 9 | 0001-setup-xorg-base-initial-commit.patch |
10 | 0002-setup-gparted-desktop-new-setup-script.patch | 10 | 0002-setup-gparted-desktop-new-setup-script.patch |
11 | 0003-setup-disk-fix-data-only-mode-with-no-lvm-and-no-rai.patch | ||
12 | " | 11 | " |
13 | 12 | ||
14 | arch="all" | 13 | arch="all" |
@@ -39,7 +38,6 @@ package() { | |||
39 | ln -s lbu "$pkgdir"/sbin/lbu_$i | 38 | ln -s lbu "$pkgdir"/sbin/lbu_$i |
40 | done | 39 | done |
41 | } | 40 | } |
42 | md5sums="a8068da6ae47c1bc567ba215b0da6187 alpine-conf-2.8.1.tar.bz2 | 41 | md5sums="d9f826d64fe49c93b2c1e737896ca426 alpine-conf-2.8.2.tar.bz2 |
43 | f3bdd33354ae0ab3c70542de33f410d0 0001-setup-xorg-base-initial-commit.patch | 42 | f3bdd33354ae0ab3c70542de33f410d0 0001-setup-xorg-base-initial-commit.patch |
44 | e2903187d61407c997366529ce30ea96 0002-setup-gparted-desktop-new-setup-script.patch | 43 | e2903187d61407c997366529ce30ea96 0002-setup-gparted-desktop-new-setup-script.patch" |
45 | cff937daddfbb63a921523618ca34da8 0003-setup-disk-fix-data-only-mode-with-no-lvm-and-no-rai.patch" | ||