From mboxrd@z Thu Jan 1 00:00:00 1970
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
84902aa499cedf798c274e582d35afdf25575ff1
Date: Sun, 04 Nov 2018 09:20:05 +0000
Message-ID: <20181104092005.809871081BB0@git01.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8295628985303580826=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============8295628985303580826==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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
=20
fixes: #11916
=20
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/cor=
e/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=3D"${1}"
local output=3D"${2}"
=20
- local args=3D"-J -r -V 'ipfire backup ${TS}' \
- -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-t=
able \
- -c boot/isolinux/boot.catalog"
+ local args=3D
=20
# Add EFI options when EFI image is present
if [ -e "${dir}/boot/isolinux/efiboot.img" ]; then
@@ -15,7 +13,10 @@ makeiso() {
fi
=20
# 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-t=
able \
+ -c boot/isolinux/boot.catalog \
+ ${args} ${dir} > ${output}
=20
# Add DOS paritition table
if [ -e "${dir}/boot/isolinux/efiboot.img" ]; then
hooks/post-receive
--
IPFire 2.x development tree
--===============8295628985303580826==--