backup: fix backupiso mastering mirror-rootzone
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 4 Nov 2018 09:16:26 +0000 (10:16 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 4 Nov 2018 09:16:26 +0000 (10:16 +0100)
fixes: #11916

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
config/rootfiles/core/125/filelists/files
src/scripts/backupiso

index ab7eeee..286ce4c 100644 (file)
@@ -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
index 2cdef00..d4df6d2 100644 (file)
@@ -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