From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c845152b6d4882394f74a5347a785f6a570b6787 Date: Sun, 26 Jan 2020 12:10:46 +0000 Message-ID: <485BY32qHRz2y3q@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6879139577678413929==" List-Id: --===============6879139577678413929== 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 c845152b6d4882394f74a5347a785f6a570b6787 (commit) via 6df8a22b8ae124d5312b84de97cb123fb31de969 (commit) from a83bcf914c9214d522d99966386c0a989c651f0f (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 c845152b6d4882394f74a5347a785f6a570b6787 Author: Arne Fitzenreiter Date: Sun Jan 26 13:10:13 2020 +0100 set version and pakfire version to core141 =20 Signed-off-by: Arne Fitzenreiter commit 6df8a22b8ae124d5312b84de97cb123fb31de969 Author: Arne Fitzenreiter Date: Sun Jan 26 13:07:08 2020 +0100 core141: correct move of nobeeps flag =20 in core139 there was a syntax error, and it was missed in backup converter also. =20 fixes #12273 =20 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: config/backup/backup.pl | 3 +++ config/rootfiles/core/141/update.sh | 3 +++ make.sh | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index aae31098a..9a92a9d9f 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -146,6 +146,9 @@ restore_backup() { # Convert DNS settings convert-dns-settings =20 + # move nobeeps if exist + [ -e "/var/ipfire/ppp/nobeeps" ] && mv /var/ipfire/ppp/nobeeps /var/ipfire/= red/nobeeps + return 0 } =20 diff --git a/config/rootfiles/core/141/update.sh b/config/rootfiles/core/141/= update.sh index b6e8464f3..87f1fe38c 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 =20 +# move nobeeps if exist +[ -e "/var/ipfire/ppp/nobeeps" ] && mv /var/ipfire/ppp/nobeeps /var/ipfire/r= ed/nobeeps + # Start services /etc/init.d/unbound restart =20 diff --git a/make.sh b/make.sh index 0d32f812b..452284c16 100755 --- a/make.sh +++ b/make.sh @@ -26,8 +26,8 @@ NAME=3D"IPFire" # Software name SNAME=3D"ipfire" # Short name # If you update the version don't forget to update backupiso and add it to c= ore update VERSION=3D"2.25" # Version number -CORE=3D"140" # Core Level (Filename) -PAKFIRE_CORE=3D"140" # Core Level (PAKFIRE) +CORE=3D"141" # Core Level (Filename) +PAKFIRE_CORE=3D"141" # Core Level (PAKFIRE) GIT_BRANCH=3D`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN=3D"www.ipfire.org" # Software slogan CONFIG_ROOT=3D/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree --===============6879139577678413929==--