From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 4 Nov 2018 09:16:26 +0000 (+0100)
Subject: backup: fix backupiso mastering
X-Git-Tag: v2.21-core125~20
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=84902aa499cedf798c274e582d35afdf25575ff1

backup: fix backupiso mastering

fixes: #11916

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

diff --git a/config/rootfiles/core/125/filelists/files b/config/rootfiles/core/125/filelists/files
index ab7eeee477..286ce4c890 100644
--- a/config/rootfiles/core/125/filelists/files
+++ b/config/rootfiles/core/125/filelists/files
@@ -7,6 +7,7 @@ srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/media.cgi
 srv/web/ipfire/cgi-bin/pakfire.cgi
+usr/local/bin/backupiso
 usr/local/bin/makegraphs
 var/ipfire/backup/bin/backup.pl
 var/ipfire/backup/include
diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index 2cdef0094a..d4df6d2c6a 100644
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -5,9 +5,7 @@ makeiso() {
 	local dir="${1}"
 	local output="${2}"
 
-	local args="-J -r -V 'ipfire backup ${TS}' \
-		-b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
-		-c boot/isolinux/boot.catalog"
+	local args=
 
 	# Add EFI options when EFI image is present
 	if [ -e "${dir}/boot/isolinux/efiboot.img" ]; then
@@ -15,7 +13,10 @@ makeiso() {
 	fi
 
 	# Compose ISO
-	mkisofs ${args} ${dir} > ${output}
+	mkisofs -J -r -V "ipfire backup ${TS}" \
+		-b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
+		-c boot/isolinux/boot.catalog \
+		${args} ${dir} > ${output}
 
 	# Add DOS paritition table
 	if [ -e "${dir}/boot/isolinux/efiboot.img" ]; then