diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-09-22 15:02:36 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-09-22 15:02:36 +0200 |
| commit | 559f7d9f8be854165177360fd5730bf6a7f45704 (patch) | |
| tree | d3b8ceef34d6174d8e210ae0a24f54f1cec0fa5b /main/alpine-conf | |
| parent | 5290e302b5d05d8f8d0c0c271c21bc3a8b398c04 (diff) | |
| download | aports-559f7d9f8be854165177360fd5730bf6a7f45704.tar.bz2 aports-559f7d9f8be854165177360fd5730bf6a7f45704.tar.xz | |
main/alpine-conf: fix detection of volume group in setup-disk
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/0001-setup-disk-fix-detection-of-volume-group.patch | 27 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 12 |
2 files changed, 35 insertions, 4 deletions
diff --git a/main/alpine-conf/0001-setup-disk-fix-detection-of-volume-group.patch b/main/alpine-conf/0001-setup-disk-fix-detection-of-volume-group.patch new file mode 100644 index 0000000000..d352e9372a --- /dev/null +++ b/main/alpine-conf/0001-setup-disk-fix-detection-of-volume-group.patch @@ -0,0 +1,27 @@ +From bf5cbd06213b6fdd6dd24fb0c5dd2fe4ca3950f0 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 22 Sep 2015 14:55:54 +0200 +Subject: [PATCH] setup-disk: fix detection of volume group + +when we have a device like /dev/mapper/vg0-lv_root, then will the LV +name not match with lvs' first column. +--- + setup-disk.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup-disk.in b/setup-disk.in +index 55b6dcb..6d021f7 100644 +--- a/setup-disk.in ++++ b/setup-disk.in +@@ -152,7 +152,7 @@ supported_boot_fs() { + + find_volume_group() { + local lv=${1##*/} +- lvs --noheadings "$1" | awk "\$1 == \"$lv\" {print \$2}" ++ lvs --noheadings "$1" | awk '{print $2}' + } + + find_pvs_in_vg() { +-- +2.5.3 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 8641e03289..4619989078 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=3.2.1 -pkgrel=6 +pkgrel=7 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" @@ -13,6 +13,7 @@ source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.x 0001-setup-disk-fix-btrfs-root.patch 0001-setup-bootable-warn-and-fix-kernel-name-change.patch 0001-setup-timezone-fix-use-of-z-option.patch + 0001-setup-disk-fix-detection-of-volume-group.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -44,16 +45,19 @@ f1439adcfc377c56b987b379b725f0af 0001-setup-apkrepos-fix-speed-test-of-mirrors. f2da5b6cf6e4f1c1d24b59210b172bd8 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch bb1acd69593e19a9ab686cf6b790bbdb 0001-setup-disk-fix-btrfs-root.patch f73ccf7115d83a7230fd124c507e3c5c 0001-setup-bootable-warn-and-fix-kernel-name-change.patch -8a67f0ac0826102dc9dceab34c6e036e 0001-setup-timezone-fix-use-of-z-option.patch" +8a67f0ac0826102dc9dceab34c6e036e 0001-setup-timezone-fix-use-of-z-option.patch +6d8735a89245a5828760b0db80c19edd 0001-setup-disk-fix-detection-of-volume-group.patch" sha256sums="f0e7954bb1a5144f551694acfde818bbad4e42a575e7a8e3a06a777ade7a5d9d alpine-conf-3.2.1.tar.xz e30d5fc4c1ae6af9673c543427561d027792c1bb26e3901ce954d15689dc66e9 0001-setup-apkrepos-fix-speed-test-of-mirrors.patch 6e532930bc263d004975fe1feac115f17452e9f80b5efb22f538e7ebcbb6636d 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch 1ec287f5ec4ca94af1b02067eb3a785e527a7658ed737b28e5f39c437db66625 0001-setup-disk-fix-btrfs-root.patch 8fdde27235e14dc1f0f8ed7edb1f086b792f6be060e329e8c2c59d9064b1ee3f 0001-setup-bootable-warn-and-fix-kernel-name-change.patch -c917e5e1e4f7cf7cb5a0cd9922d7e92654d761fb301977c02866a03f374fd184 0001-setup-timezone-fix-use-of-z-option.patch" +c917e5e1e4f7cf7cb5a0cd9922d7e92654d761fb301977c02866a03f374fd184 0001-setup-timezone-fix-use-of-z-option.patch +cafb433dc1bef88a645b4c4504b207fb09392d112294219d706ac04984725c8c 0001-setup-disk-fix-detection-of-volume-group.patch" sha512sums="20c11b134234708d86fe4cc093c4073df3496a43d13994d0df369066afed39a9a3c97cebacdbb6518f212e414c9456c31ee41bd600b3fc29e892448118a7b5e8 alpine-conf-3.2.1.tar.xz 135bd0a0638f14a90d896c31de09eb3aa08cd7b2b1452fa20fdf12d128282c5c9eee5c1d76f7d8b62714f15395f225bf61c9968ad04ff164e64e8924c89abbd6 0001-setup-apkrepos-fix-speed-test-of-mirrors.patch cd2c1f3adef443edf4473719f1cf4f277336fb59527ba70ed30f1f2c87d3cc63afe55a009b5bb5666ff79784ea8a79730dfb67a37d8e3fd8fe8fd7eb88a564fc 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch 0d7e6ce26798ab42bf1e2cbda6421e811e949d427e1ff69210abd950686f5ff0a5d61404db9de160268ae976e768aba74f51814b8a9b6e318c32563f924a3965 0001-setup-disk-fix-btrfs-root.patch df9c2cec67054390d8e8c81b797cfbf0f1b142faabe389f2adf99094b15642285ad683a875728cfff0f13ebb91b3d16eb1ded2ee889b0f9d29a6d05a2a584b83 0001-setup-bootable-warn-and-fix-kernel-name-change.patch -13062f853d30126d77c5201516d978bf30e154a8efd66b0869c7732550694a49e7ad45d29014242cb51a3917c8e7da6af99e51319792a2e89cb8ff9dd69ea08e 0001-setup-timezone-fix-use-of-z-option.patch" +13062f853d30126d77c5201516d978bf30e154a8efd66b0869c7732550694a49e7ad45d29014242cb51a3917c8e7da6af99e51319792a2e89cb8ff9dd69ea08e 0001-setup-timezone-fix-use-of-z-option.patch +0aee56acd398d22af0dbee887a15c7bf1529c7c6b23618643078be1bd9db300f1fb1f4a2549cf09f21c29aa19d6510221399442582b8a6525f24a3c2f10c174e 0001-setup-disk-fix-detection-of-volume-group.patch" |