From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 3/3] backup: Fork ISO job into the background in CGI script
Date: Thu, 02 Dec 2021 12:37:15 +0000 [thread overview]
Message-ID: <20211202123715.2525482-3-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20211202123715.2525482-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1349 bytes --]
In order to be able to run the ISO command on command line it is helpful
that the script does not go into background halfway through the process.
We should rather start it as a background job straight from the CGI
script.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/backup/backup.pl | 2 +-
html/cgi-bin/backup.cgi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index bed5952de..afd8d1663 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -247,7 +247,7 @@ main() {
local filename="/var/ipfire/backup/${NOW}.ipf"
if make_backup "${filename}"; then
- /usr/local/bin/backupiso "${NOW}" &
+ /usr/local/bin/backupiso "${NOW}"
fi
;;
diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
index 84c015314..1b1ccb4a8 100644
--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.cgi
@@ -119,7 +119,7 @@ if ( $cgiparams{'ACTION'} eq "backup" )
} elsif ( $cgiparams{'BACKUPLOGS'} eq "exclude" ) {
&General::system("/usr/local/bin/backupctrl", "exclude");
} elsif ( $cgiparams{'BACKUPLOGS'} eq "iso" ) {
- &General::system("/usr/local/bin/backupctrl", "iso");
+ &General::system_background("/usr/local/bin/backupctrl", "iso");
}
}
if ( $cgiparams{'ACTION'} eq "addonbackup" )
--
2.30.2
prev parent reply other threads:[~2021-12-02 12:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-02 12:37 [PATCH 1/3] backup: Use filename as specified on console Michael Tremer
2021-12-02 12:37 ` [PATCH 2/3] backup: Create tarball in one pass Michael Tremer
2021-12-02 13:42 ` Adolf Belka
2021-12-02 15:48 ` Michael Tremer
2021-12-03 13:54 ` Adolf Belka
2021-12-06 18:40 ` Paul Simmons
2021-12-02 12:37 ` Michael Tremer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211202123715.2525482-3-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox