From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 7 Nov 2018 18:16:57 +0000 (+0100)
Subject: backupiso: fix boot on EFI
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6104f2e816a215540fd3b08fbba2fd90af59a798;p=people%2Fms%2Fipfire-2.x.git

backupiso: fix boot on EFI

the grub on EFI serch the config on volume "IPFire 2.21 arch"
so the custom "ipfire backup ..." volume name is not working
anymore.
This is now fixed and a backup-version.media tag will added.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index d4df6d2c6a..2b91b5f6a5 100644
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -1,5 +1,10 @@
 #!/bin/sh
 arch=$(uname -m)
+IPFVER=2.21
+COREVER=$(cat /opt/pakfire/db/core/mine)
+# FIXME: edit this lines before release
+URL="https://downloads.ipfire.org/releases/ipfire-2.x/$IPFVER-core$COREVER/"
+ISO="ipfire-$IPFVER.$arch-full-core$COREVER.iso"
 
 makeiso() {
 	local dir="${1}"
@@ -13,7 +18,7 @@ makeiso() {
 	fi
 
 	# Compose ISO
-	mkisofs -J -r -V "ipfire backup ${TS}" \
+	mkisofs -J -r -V "IPFire ${IPFVER} ${arch}" \
 		-b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
 		-c boot/isolinux/boot.catalog \
 		${args} ${dir} > ${output}
@@ -43,11 +48,6 @@ case $arch in
 		;;
 esac
 
-COREVER=$(cat /opt/pakfire/db/core/mine)
-# FIXME: edit this lines before release
-URL="https://downloads.ipfire.org/releases/ipfire-2.x/2.21-core$COREVER/"
-ISO="ipfire-2.21.$arch-full-core$COREVER.iso"
-
 if [ -z $1 ]; then
 	echo usage: $0 backup-file
 	exit
@@ -99,6 +99,9 @@ rm -r backupiso.tmp.${TS}
 # Copy backup file to disk
 cp "/var/ipfire/backup/${TS}.ipf" "backupiso.${TS}/backup.ipf"
 
+# Add a version tag
+touch "backupiso.${TS}/backup-${TS}.media"
+
 echo "Running mkisofs"
 makeiso backupiso.${TS} $(basename ${ISO} .iso)-${TS}.iso