main/alpine-conf: fix creating boot usb of v2.7

fixes #2363

2 files changed, 125 insertions, 3 deletions

diff --git a/main/alpine-conf/0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch b/main/alpine-conf/0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch
new file mode 100644
index 0000000000..1b81d5fa0d
--- /dev/null
+++ b/main/alpine-conf/0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch
@@ -0,0 +1,120 @@
+From 1d006a11c9a2e42ea4b3b60e1bed82373a1d027e Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 7 Nov 2013 14:14:03 +0100
+Subject: [PATCH] setup-bootable: move syslinux.cfg to /boot/syslinux/ if
+ needed
+
+(cherry picked from commit e8c99e12ef55bbc4d5a3bbb1d4075fb9d8bb8cae)
+---
+ setup-bootable.in | 55 +++++++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 37 insertions(+), 18 deletions(-)
+
+diff --git a/setup-bootable.in b/setup-bootable.in
+index 2c16bc5..30cebde 100644
+--- a/setup-bootable.in
++++ b/setup-bootable.in
+@@ -175,7 +175,7 @@ parent_dev=$(find_disk_dev $dev)
+ # check if this files exist and not in upgrade mode
+ if [ -z "$upgrade" ] && [ -z "$force" ]; then
+ 	for i in boot apks syslinux.cfg .alpine-release; do
+-		[ -e "$destdir"/$i ] && die "$destdir/$i already exists. Aborting"
++		[ -e "$destdir"/$i ] && die "$destdir/$i already exists. Use -u to upgrade."
+ 	done
+ fi
+ 
+@@ -208,15 +208,17 @@ available_space=$(( $free_blocks / $blocks_per_mb ))
+ vecho "Available space: $available_space MiB"
+ 
+ if [ -n "$srcdir" ]; then
+-	needed_space=$(cd "$srcdir" && du -m -s -c boot apks syslinux.cfg .alpine-release | awk '$2 == "total" {print $1}')
++	needed_space=$(cd "$srcdir" && du -m -s -c boot apks .alpine-release | awk '$2 == "total" {print $1}')
+ 	vecho "Needed space:    $needed_space MiB"
+ 	[ $available_space -lt $needed_space ] \
+ 		&& die "Not enough space on $destdir. Aborting."
+ 
+ 	# copy the files to .new
+ 	for i in boot apks syslinux.cfg .alpine-release; do
+-		vecho "Copying $srcdir/$i to $destdir/.new/"
+-		cp -a "$srcdir"/$i "$destdir"/.new/
++		if [ -e "$srcdir"/$i ]; then
++			vecho "Copying $srcdir/$i to $destdir/.new/"
++			cp -a "$srcdir"/$i "$destdir"/.new/
++		fi
+ 	done
+ elif [ -n "$srcurl" ]; then
+ 	cd "$destdir"/.new
+@@ -225,6 +227,19 @@ elif [ -n "$srcurl" ]; then
+ 	echo ""
+ fi
+ 
++# find where new syslinux.cfg is
++for i in boot/syslinux/syslinux.cfg syslinux.cfg; do
++	if [ -e "$destdir"/.new/$i ]; then
++		syslinux_cfg=$i
++		vecho "Found $syslinux_cfg"
++		break
++	fi
++done
++# abort early in case unexpected trouble
++if [ -z "$syslinux_cfg" ]; then
++	die "Could not find any syslinux.cfg on new iso?"
++fi
++
+ # make sure files are really there before we replace existing
+ vecho "Flushing cache..."
+ sync
+@@ -232,18 +247,7 @@ sync
+ vecho "Replacing existing files..."
+ mkdir -p "$destdir"/.old || die "Failed to create $destdir/.old"
+ 
+-# do we want keep existing syslinux.cfg?
+-tomove="boot apks .alpine-release"
+-if [ -n "$force" ] || ! [ -e "$destdir"/syslinux.cfg ]; then
+-	tomove="$tomove syslinux.cfg"
+-	# update syslinux.cfg unless device is on usb bus
+-	# this is so we can boot from CF's and harddisk 
+-	if ! on_usb_bus $parent_dev; then
+-		vecho "Updating syslinux.cfg to use $dest"
+-		sed -i -e "s/usbdisk/${dest##*/}/g" \
+-			"$destdir"/.new/syslinux.cfg
+-	fi
+-fi
++tomove="boot apks syslinux.cfg .alpine-release"
+ 
+ # move current files to .old
+ for i in $tomove; do
+@@ -252,14 +256,29 @@ for i in $tomove; do
+ 	fi
+ done
+ 
++# keep any existing syslinux.cfg
++if [ -e "$destdir"/.old/$syslinux_cfg ]; then
++	mv "$destdir"/.old/$syslinux_cfg "$destdir"/.new/$syslinux_cfg
++elif [ -e "$destdir"/.old/syslinux.cfg ] \
++		&& [ -e "$destdir"/.new/boot/syslinux/syslinux.cfg ]; then
++	echo "Warning: moving syslinux.cfg to boot/syslinux/syslinux.cfg" >&2
++	mv "$destdir"/.old/syslinux.cfg "$destdir"/.new/boot/syslinux
++	if [ -z "$syslinux" ]; then
++		echo "         You might need run: syslinux $dest" >&2
++	fi
++fi
++
+ # move .new to current
+ for i in $tomove; do
+-	mv "$destdir"/.new/$i "$destdir"/ || die "Failed to move $destdir/.new/ to $destdir"
++	if [ -e "$destdir"/.new/$i ]; then
++		mv "$destdir"/.new/$i "$destdir"/ \
++			|| die "Failed to move $destdir/.new/ to $destdir"
++	fi
+ done
+ 
+ if [ -z "$keep_alpine_dev" ] && [ -n "$UUID" ]; then
+ 	sed -i -e "s/alpine_dev=[^ \t:]\+/alpine_dev=UUID=$UUID/" \
+-		"$destdir"/syslinux.cfg
++		"$destdir"/$syslinux_cfg
+ fi
+ 
+ # cleanup
+-- 
+1.8.5.1
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 0d8f2be7a7..95b327ee18 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.11.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 depends="openrc"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
 	0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch
 	0001-setup-interfaces-fix-vlan-raw-device.patch
+	0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch
 	"
 
 arch="all"
@@ -38,6 +39,7 @@ package() {
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
-md5sums="09a8315fa1a5746b961f0dd6e65cdd8d  alpine-conf-2.11.3.tar.bz2
+md5sums="644ff55b73bc60bb789dc12f1d4dc124  alpine-conf-2.11.3.tar.bz2
 1f2ee5791a9bb40bd5e9862f60299ce2  0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch
-8e528859d2ea4d24e2de9436c499a64d  0001-setup-interfaces-fix-vlan-raw-device.patch"
+8e528859d2ea4d24e2de9436c499a64d  0001-setup-interfaces-fix-vlan-raw-device.patch
+149c5ced712830b860dc7530e8ba51fe  0001-setup-bootable-move-syslinux.cfg-to-boot-syslinux-if.patch"