[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 84902aa499cedf798c274e582d35afdf25575ff1

[Arne Fitzenreiter <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2600 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  84902aa499cedf798c274e582d35afdf25575ff1 (commit)
      from  912c590bb61d7d84893ee4b7f382f9eba0463b8f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 84902aa499cedf798c274e582d35afdf25575ff1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Nov 4 10:16:26 2018 +0100

    backup: fix backupiso mastering
    
    fixes: #11916
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/125/filelists/files | 1 +
 src/scripts/backupiso                     | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/125/filelists/files b/config/rootfiles/core/125/filelists/files
index ab7eeee47..286ce4c89 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 2cdef0094..d4df6d2c6 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


hooks/post-receive
--
IPFire 2.x development tree