From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 26 Jan 2020 12:07:08 +0000 (+0100)
Subject: core141: correct move of nobeeps flag
X-Git-Tag: v2.25-core141~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6df8a22b8ae124d5312b84de97cb123fb31de969;p=ipfire-2.x.git

core141: correct move of nobeeps flag

in core139 there was a syntax error, and it was missed in
backup converter also.

fixes #12273

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

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index aae31098a0..9a92a9d9f7 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -146,6 +146,9 @@ restore_backup() {
 	# Convert DNS settings
 	convert-dns-settings
 
+	# move nobeeps if exist
+	[ -e "/var/ipfire/ppp/nobeeps" ] && mv /var/ipfire/ppp/nobeeps /var/ipfire/red/nobeeps
+
 	return 0
 }
 
diff --git a/config/rootfiles/core/141/update.sh b/config/rootfiles/core/141/update.sh
index b6e8464f33..87f1fe38c3 100644
--- a/config/rootfiles/core/141/update.sh
+++ b/config/rootfiles/core/141/update.sh
@@ -74,6 +74,9 @@ telinit u
 # Convert DNS settings
 /usr/local/bin/convert-dns-settings
 
+# move nobeeps if exist
+[ -e "/var/ipfire/ppp/nobeeps" ] && mv /var/ipfire/ppp/nobeeps /var/ipfire/red/nobeeps
+
 # Start services
 /etc/init.d/unbound restart