diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-06-07 14:27:12 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-06-07 14:27:12 +0000 |
| commit | abf6e4cd59bd0a025e64f5e4ee418a1ec32e52e9 (patch) | |
| tree | bb2111a75dfc6e7b387b29c703761941e7fda5e5 /main/alpine-conf | |
| parent | 590a7cbc3cc21088b6d2ce4ab2e655ffbc37b29b (diff) | |
| download | aports-abf6e4cd59bd0a025e64f5e4ee418a1ec32e52e9.tar.bz2 aports-abf6e4cd59bd0a025e64f5e4ee418a1ec32e52e9.tar.xz | |
main/alpine-conf: apply setup-disk from upstream
ref #678
Diffstat (limited to 'main/alpine-conf')
4 files changed, 35 insertions, 5 deletions
diff --git a/main/alpine-conf/0001-setup-xorg-base-initial-commit.patch b/main/alpine-conf/0001-setup-xorg-base-initial-commit.patch index f0f1067ec3..301e5777c2 100644 --- a/main/alpine-conf/0001-setup-xorg-base-initial-commit.patch +++ b/main/alpine-conf/0001-setup-xorg-base-initial-commit.patch @@ -1,7 +1,7 @@ From 049d3ce1efda40a59bd42834d3b8db5cdb0386fa Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Mon, 6 Jun 2011 11:39:45 +0000 -Subject: [PATCH 1/2] setup-xorg-base: initial commit +Subject: [PATCH 1/3] setup-xorg-base: initial commit This script is supposed to help users to quickly get a working xorg server running. diff --git a/main/alpine-conf/0002-setup-gparted-desktop-new-setup-script.patch b/main/alpine-conf/0002-setup-gparted-desktop-new-setup-script.patch index 9c15b337a6..6cacebb3b4 100644 --- a/main/alpine-conf/0002-setup-gparted-desktop-new-setup-script.patch +++ b/main/alpine-conf/0002-setup-gparted-desktop-new-setup-script.patch @@ -1,7 +1,7 @@ From d71205d14c74516925c0e837ba02135f36f084c6 Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Mon, 6 Jun 2011 14:55:19 +0000 -Subject: [PATCH 2/2] setup-gparted-desktop: new setup script +Subject: [PATCH 2/3] setup-gparted-desktop: new setup script The idea is that you quick and dirty can get gparted up and running --- 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 new file mode 100644 index 0000000000..69fa9a1c2f --- /dev/null +++ b/main/alpine-conf/0003-setup-disk-fix-data-only-mode-with-no-lvm-and-no-rai.patch @@ -0,0 +1,28 @@ +From 6dbbe28a459e79acb9e7ba44d43295df9a0f45f8 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 7 Jun 2011 14:17:30 +0000 +Subject: [PATCH 3/3] setup-disk: fix data-only mode with no lvm and no raid + +ref #678 +--- + setup-disk.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup-disk.in b/setup-disk.in +index 9d073ec..026e32a 100644 +--- a/setup-disk.in ++++ b/setup-disk.in +@@ -612,8 +612,8 @@ data_only_disk_install_lvm() { + + data_only_disk_install() { + local diskdev= +- local var_dev=/dev/$vgname/lv_var +- local var_part_type="8e" ++ local var_dev= ++ local var_part_type="83" + local swap_part_type=82 + local size= + local swap_dev= var_dev= +-- +1.7.5.4 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index b08e6d35fc..bb86f65dad 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=2.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname depends="openrc" source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2 0001-setup-xorg-base-initial-commit.patch 0002-setup-gparted-desktop-new-setup-script.patch + 0003-setup-disk-fix-data-only-mode-with-no-lvm-and-no-rai.patch " arch="all" @@ -39,5 +40,6 @@ package() { done } md5sums="a8068da6ae47c1bc567ba215b0da6187 alpine-conf-2.8.1.tar.bz2 -0bae26b57051fa3058687401cccf90cf 0001-setup-xorg-base-initial-commit.patch -d3e1ad87641e8420fa0272d544c068d1 0002-setup-gparted-desktop-new-setup-script.patch" +f3bdd33354ae0ab3c70542de33f410d0 0001-setup-xorg-base-initial-commit.patch +e2903187d61407c997366529ce30ea96 0002-setup-gparted-desktop-new-setup-script.patch +cff937daddfbb63a921523618ca34da8 0003-setup-disk-fix-data-only-mode-with-no-lvm-and-no-rai.patch" |