diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-05 15:13:04 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-05 16:33:01 +0100 |
| commit | bf7f7ef2699bdf89222427fe16a34707fa394065 (patch) | |
| tree | c07af5fb16008d7b4e361730fbded52ab74f7b1b | |
| parent | e3884fbde941e42651d3a137bd20e9e09660714c (diff) | |
| download | aports-bf7f7ef2699bdf89222427fe16a34707fa394065.tar.bz2 aports-bf7f7ef2699bdf89222427fe16a34707fa394065.tar.xz | |
main/alpine-conf: use UUID on new boot usbs
| -rw-r--r-- | main/alpine-conf/0001-setup-bootable-use-UUID-on-new-USBs.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-bootable-use-UUID-on-new-USBs.patch b/main/alpine-conf/0001-setup-bootable-use-UUID-on-new-USBs.patch new file mode 100644 index 0000000000..82c8a49736 --- /dev/null +++ b/main/alpine-conf/0001-setup-bootable-use-UUID-on-new-USBs.patch @@ -0,0 +1,25 @@ +From 6df463ada5052a39b32a443b276b489c431a115f Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 5 Nov 2013 14:15:44 +0100 +Subject: [PATCH] setup-bootable: use UUID on new USBs + +--- + setup-bootable.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup-bootable.in b/setup-bootable.in +index 18e41bf..2df03e6 100644 +--- a/setup-bootable.in ++++ b/setup-bootable.in +@@ -256,7 +256,7 @@ for i in $tomove; do + mv "$destdir"/.new/$i "$destdir"/ || die "Failed to move $destdir/.new/ to $destdir" + done + +-if [ -n "$replace_alpine_dev" ] && [ -n "$UUID" ]; then ++if [ -n "$replace_alpine_dev" -o -z "$upgrade" ] && [ -n "$UUID" ]; then + sed -i -e "s/alpine_dev=[^ \t:]\+/alpine_dev=UUID=$UUID/" \ + "$destdir"/syslinux.cfg + fi +-- +1.8.4.2 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index a0811a7c87..98c9a37a20 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.14.0 -pkgrel=1 +pkgrel=2 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" license="GPL2" depends="openrc" source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz + 0001-setup-bootable-use-UUID-on-new-USBs.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -34,6 +35,9 @@ package() { done } -md5sums="94b82dd9d7a2c63aa6909238da3b44b3 alpine-conf-2.14.0.tar.xz" -sha256sums="14dc81845b16ffcbb39af9d0c5aeffab68166eec154c822b7c1c9c0697823d5b alpine-conf-2.14.0.tar.xz" -sha512sums="39aa74e676221475ce088d82b134563c3dd04a69e90919089d3876b6a4715f6df58aa156352a40d9f817414cbdb603350a3e9c15914fb254a24d8cef4acd6581 alpine-conf-2.14.0.tar.xz" +md5sums="94b82dd9d7a2c63aa6909238da3b44b3 alpine-conf-2.14.0.tar.xz +c0eeeebfb67b757c954a2f5100461a7b 0001-setup-bootable-use-UUID-on-new-USBs.patch" +sha256sums="14dc81845b16ffcbb39af9d0c5aeffab68166eec154c822b7c1c9c0697823d5b alpine-conf-2.14.0.tar.xz +754a59868f069c4eb2321034f00539ea02e734ede1a483b9c9ec5360c788f8c1 0001-setup-bootable-use-UUID-on-new-USBs.patch" +sha512sums="39aa74e676221475ce088d82b134563c3dd04a69e90919089d3876b6a4715f6df58aa156352a40d9f817414cbdb603350a3e9c15914fb254a24d8cef4acd6581 alpine-conf-2.14.0.tar.xz +3b2d2fb754421f7dd4c45c7212544c2f34587da9da10e777ee9de153dd77e70d016bf8b270d72dd6ee8299c99a17f2969bddef586afbdcac13b4d76c87bcc35e 0001-setup-bootable-use-UUID-on-new-USBs.patch" |