diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-19 12:24:59 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-19 12:25:27 +0000 |
| commit | fa535ab866a2c4085039cb509567fa09239b0cfa (patch) | |
| tree | ad7f97e8a95ef287ba05adf22912bf20c696446d /main/alpine-conf | |
| parent | 3f8195e45a7f63c342dd7541af2008af9d20ef52 (diff) | |
| download | aports-fa535ab866a2c4085039cb509567fa09239b0cfa.tar.bz2 aports-fa535ab866a2c4085039cb509567fa09239b0cfa.tar.xz | |
main/alpine-conf: fix typo in setup-disk
ref #3979
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/0001-setup-disk-fix-typo.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-fix-typo.patch b/main/alpine-conf/0001-setup-disk-fix-typo.patch new file mode 100644 index 000000000..50886aa99 --- /dev/null +++ b/main/alpine-conf/0001-setup-disk-fix-typo.patch @@ -0,0 +1,25 @@ +From 34d5c6cd766e9565c09721004f68f570b40da857 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 19 Mar 2015 12:23:46 +0000 +Subject: [PATCH] setup-disk: fix typo + +--- + setup-disk.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup-disk.in b/setup-disk.in +index f4401dd..ad9684e 100644 +--- a/setup-disk.in ++++ b/setup-disk.in +@@ -460,7 +460,7 @@ confirm_erase() { + local answer= + local erasedisks="$@" + if [ "$ERASE_DISKS" = "$erasedisks" ]; then +- reeturn 0 ++ return 0 + fi + echo "WARNING: The following disk(s) will be erased:" + show_disk_info $@ +-- +2.3.3 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index fad18922c..3b5854dd9 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.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" @@ -10,6 +10,7 @@ depends="openrc" source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz 0001-update-kernel-fix-typo.patch 0001-setup-disk-pass-nomodeset-boot-option.patch + 0001-setup-disk-fix-typo.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -38,10 +39,13 @@ package() { md5sums="d48adaa13dbba0e4c461b39a59fb1c10 alpine-conf-3.1.0.tar.xz fe4a81cdf9d30c1f0bbcc9977e96410a 0001-update-kernel-fix-typo.patch -4b7844387da57e3ffdcd1e09c0a45fb6 0001-setup-disk-pass-nomodeset-boot-option.patch" +4b7844387da57e3ffdcd1e09c0a45fb6 0001-setup-disk-pass-nomodeset-boot-option.patch +968fac093f66bb6e92f24cbf1d1cbeaf 0001-setup-disk-fix-typo.patch" sha256sums="5c5c3081fba18c0303bd29ccf8caab5d550c0a767f9b3b1e6a0644b717661122 alpine-conf-3.1.0.tar.xz cc1a2254eae01c2cde362cc7cf65d6e5ba7d53a7ced8a170b0502130af6877be 0001-update-kernel-fix-typo.patch -a5e486f41dafdca904e1d67b2bb26d871e6ec9597295e1fc21ea5d8995986570 0001-setup-disk-pass-nomodeset-boot-option.patch" +a5e486f41dafdca904e1d67b2bb26d871e6ec9597295e1fc21ea5d8995986570 0001-setup-disk-pass-nomodeset-boot-option.patch +e03066193c158d489b0169c6ec7fbbce2fedba23e28e92d40a5d9ab4920c8102 0001-setup-disk-fix-typo.patch" sha512sums="22ce9a149171cf8503937b60d36ec2b69fb95123d3e3f7776cc3c9e0f14cdc8a9a2338be8c223233652cd1456f6b55bbc71ed0deda2efb75f0e62b67a4c40088 alpine-conf-3.1.0.tar.xz 7f30c7ecb696b4fbf815802bd9d369f2d21a2b2502efdeac3af260df72195c19199fddc81702eb204746146433a23c0649bcf1b8a71c57a34971c4457f0ac33f 0001-update-kernel-fix-typo.patch -3ff38ab78bc0a07762c7c3668cf4daaa4ca2d030ef148e61de6dbb1df4589fd2c844c992f35ce64aa9cc3125d7422ba9deb727259cc68a61e7f6d6ff22de16f7 0001-setup-disk-pass-nomodeset-boot-option.patch" +3ff38ab78bc0a07762c7c3668cf4daaa4ca2d030ef148e61de6dbb1df4589fd2c844c992f35ce64aa9cc3125d7422ba9deb727259cc68a61e7f6d6ff22de16f7 0001-setup-disk-pass-nomodeset-boot-option.patch +c6f32b0b03d0d9eadc6206fadeeaf8c7e0880dc5e556374bbf9334ed7ec8f38257f6afe4ddbc7c634c6cc722609ab8bfcd1897d586661d33b2cc6dd087edc4c1 0001-setup-disk-fix-typo.patch" |