diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-21 20:47:18 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-21 20:47:18 +0000 |
| commit | d6b12c6179488837ba49044f038e13bb6aa89606 (patch) | |
| tree | ef5426a82509d80e66a45e9e40a3ccb90f01cf32 /main/alpine-conf | |
| parent | 13f43bba56dd7a399df5e6f6cab04589170c7871 (diff) | |
| download | aports-d6b12c6179488837ba49044f038e13bb6aa89606.tar.bz2 aports-d6b12c6179488837ba49044f038e13bb6aa89606.tar.xz | |
main/alpine-conf: fix setup-disk
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/0001-setup-disk-dont-use-local-in-global-scope.patch | 25 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 12 |
2 files changed, 33 insertions, 4 deletions
diff --git a/main/alpine-conf/0001-setup-disk-dont-use-local-in-global-scope.patch b/main/alpine-conf/0001-setup-disk-dont-use-local-in-global-scope.patch new file mode 100644 index 0000000000..3d745026df --- /dev/null +++ b/main/alpine-conf/0001-setup-disk-dont-use-local-in-global-scope.patch @@ -0,0 +1,25 @@ +From f133bfa2ddf73b07e4ecf92d724ed7c416f4ff81 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 21 Dec 2016 20:44:08 +0000 +Subject: [PATCH] setup-disk: dont use local in global scope + +--- + setup-disk.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup-disk.in b/setup-disk.in +index 588d37f..ab785fb 100644 +--- a/setup-disk.in ++++ b/setup-disk.in +@@ -1031,7 +1031,7 @@ if [ -n "$diskdevs" ] && [ -z "$DISK_MODE" ]; then + while true; do + echo "The following $disk_is_or_disks_are selected${USE_LVM:+ (with LVM)}:" + show_disk_info $diskdevs +- local _lvm=${USE_LVM:-", 'lvm'"} ++ _lvm=${USE_LVM:-", 'lvm'"} + echon "How would you like to use $it_them? ('sys', 'data'${_lvm#_lvm} or '?' for help) [?] " + default_read answer '?' + case "$answer" in +-- +2.11.0 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index e747b5f377..be1d8aa6f4 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.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" @@ -9,6 +9,7 @@ license="MIT" depends="openrc>0.13" source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz 0001-update-conf-fix-quoting-in-subshell.patch + 0001-setup-disk-dont-use-local-in-global-scope.patch " builddir="$srcdir"/$pkgname-$pkgver @@ -26,8 +27,11 @@ package() { } md5sums="168deac2c9bd79d672c7d244a24754cf alpine-conf-3.5.0.tar.xz -6c5f745ed605c97e0a506e71103fa6be 0001-update-conf-fix-quoting-in-subshell.patch" +6c5f745ed605c97e0a506e71103fa6be 0001-update-conf-fix-quoting-in-subshell.patch +2e85380db1889907b2817f138599cd46 0001-setup-disk-dont-use-local-in-global-scope.patch" sha256sums="64fe2a1730105032b37463c465759e4eea2ca0e174a4be1fc01169842450a83f alpine-conf-3.5.0.tar.xz -b804c0c80722dfe4e37ab7be9a80387a1a56553eebc3c493f4d0762ec03f48f6 0001-update-conf-fix-quoting-in-subshell.patch" +b804c0c80722dfe4e37ab7be9a80387a1a56553eebc3c493f4d0762ec03f48f6 0001-update-conf-fix-quoting-in-subshell.patch +8b6ba2e7c8065975bff59324258bfeccdb44b036f9637838c5f959829e6898c5 0001-setup-disk-dont-use-local-in-global-scope.patch" sha512sums="26958579ebefa7822a11178a202c50f1bef55be8165e87e54b65b1389453e8ddcb5eac83cce2814cd8157716bae7170ae84e7e36ac996fa50804e4b94f2b25bf alpine-conf-3.5.0.tar.xz -0b40ee7565946b34be82bbb951be1ea4592fae35887b4996258e2c98697bd60a5d88df710e97b443d4ca101ef61e118aad82adbe1165d6906ce7ff338ec2b590 0001-update-conf-fix-quoting-in-subshell.patch" +0b40ee7565946b34be82bbb951be1ea4592fae35887b4996258e2c98697bd60a5d88df710e97b443d4ca101ef61e118aad82adbe1165d6906ce7ff338ec2b590 0001-update-conf-fix-quoting-in-subshell.patch +6d5994f6ca38b6d7bb1aba0a5bd7fa69d3cb1c5eda2417c53f6060ad61e17952fd01c2c301d904016822986edfe87f0e6122f37d07bd1b7b8fba22e5e5b48358 0001-setup-disk-dont-use-local-in-global-scope.patch" |