From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] index.cgi: Add warning about reiserfs deprecation and removal if reiserfs used Date: Sun, 20 Aug 2023 16:11:02 +0200 Message-ID: <20230820141102.3418126-2-adolf.belka@ipfire.org> In-Reply-To: <20230820141102.3418126-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2961214195600287976==" List-Id: --===============2961214195600287976== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - Reiserfs was stopped in IPFire in Core Update 167. It has been announced th= at reiserfs will be removed from the kernel in 2025. - This patch gives a warning about this deprecation and removal if reiserfs i= s used. The warning also requests that the user does a re-installation using either ex= t4 or xfs filesystems. - Tested out on a vm installation with reiserfs, ext4 and xfs. Messgae shown = on system with reiserfs filesystem but nopt on the other two. - Warning message added into the English language file and ./make.sh lang run. Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- doc/language_issues.de | 2 ++ doc/language_issues.en | 2 ++ doc/language_issues.es | 2 ++ doc/language_issues.fr | 2 ++ doc/language_issues.it | 2 ++ doc/language_issues.nl | 2 ++ doc/language_issues.pl | 2 ++ doc/language_issues.ru | 2 ++ doc/language_issues.tr | 2 ++ doc/language_missings | 16 ++++++++++++++++ html/cgi-bin/index.cgi | 9 ++++++++- langs/en/cgi-bin/en.pl | 2 ++ 12 files changed, 44 insertions(+), 1 deletion(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 53e81a5d5..4fd5a0819 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -933,6 +933,8 @@ WARNING: untranslated string: netbios nameserver daemon = =3D NetBIOS Nameserver Dae WARNING: untranslated string: no entries =3D No entries at the moment. WARNING: untranslated string: optional =3D Optional WARNING: untranslated string: pakfire invalid tree =3D Invalid repository se= lected +WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: required =3D Required WARNING: untranslated string: route config changed =3D unknown string WARNING: untranslated string: routing config added =3D unknown string diff --git a/doc/language_issues.en b/doc/language_issues.en index 97166df4f..70eb9fbe8 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1577,6 +1577,8 @@ WARNING: untranslated string: red1 =3D RED WARNING: untranslated string: references =3D References WARNING: untranslated string: refresh =3D Refresh WARNING: untranslated string: refresh index page while connected =3D Refresh= index.cgi page while connected +WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: release =3D Release WARNING: untranslated string: remark =3D Remark WARNING: untranslated string: remark title =3D Remark: diff --git a/doc/language_issues.es b/doc/language_issues.es index d755bea3e..45ffdf5d7 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -995,6 +995,8 @@ WARNING: untranslated string: no data =3D unknown string WARNING: untranslated string: openvpn cert expires soon =3D Expires Soon WARNING: untranslated string: openvpn cert has expired =3D Expired WARNING: untranslated string: pakfire ago =3D ago. +WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: route config changed =3D unknown string WARNING: untranslated string: routing config added =3D unknown string WARNING: untranslated string: routing config changed =3D unknown string diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 0d664336a..cacfb1ec6 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -948,6 +948,8 @@ WARNING: untranslated string: guardian logtarget_syslog = =3D unknown string WARNING: untranslated string: guardian no entries =3D unknown string WARNING: untranslated string: guardian service =3D unknown string WARNING: untranslated string: pakfire ago =3D ago. +WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: route config changed =3D unknown string WARNING: untranslated string: routing config added =3D unknown string WARNING: untranslated string: routing config changed =3D unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index 447b71af0..68ff12c86 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1215,6 +1215,8 @@ WARNING: untranslated string: rdns =3D rDNS WARNING: untranslated string: reboot fsck =3D Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck =3D Rebooting IPFire, fo= rcing filesystem check WARNING: untranslated string: received =3D Received +WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: release =3D Release WARNING: untranslated string: required =3D Required WARNING: untranslated string: required field =3D Required field diff --git a/doc/language_issues.nl b/doc/language_issues.nl index dcfb8f67f..ea0abc74c 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1238,6 +1238,8 @@ WARNING: untranslated string: ptr =3D PTR WARNING: untranslated string: rdns =3D rDNS WARNING: untranslated string: rebooting ipfire fsck =3D Rebooting IPFire, fo= rcing filesystem check WARNING: untranslated string: received =3D Received +WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: required =3D Required WARNING: untranslated string: required field =3D Required field WARNING: untranslated string: retbleed =3D Retbleed diff --git a/doc/language_issues.pl b/doc/language_issues.pl index faf686b86..893f73211 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1418,6 +1418,8 @@ WARNING: untranslated string: reboot fsck =3D Reboot & = run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck =3D Rebooting IPFire, fo= rcing filesystem check WARNING: untranslated string: received =3D Received WARNING: untranslated string: red1 =3D RED +WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: release =3D Release WARNING: untranslated string: required =3D Required WARNING: untranslated string: required field =3D Required field diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 6db59db59..64c9b5095 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1413,6 +1413,8 @@ WARNING: untranslated string: reboot fsck =3D Reboot & = run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck =3D Rebooting IPFire, fo= rcing filesystem check WARNING: untranslated string: received =3D Received WARNING: untranslated string: red1 =3D RED +WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: release =3D Release WARNING: untranslated string: required =3D Required WARNING: untranslated string: required field =3D Required field diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 7dfd3267d..eadbd33c7 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1125,6 +1125,8 @@ WARNING: untranslated string: ptr =3D PTR WARNING: untranslated string: reboot fsck =3D Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck =3D Rebooting IPFire, fo= rcing filesystem check WARNING: untranslated string: received =3D Received +WARNING: untranslated string: reiserfs warning1 =3D Reiserfs is deprecated a= nd scheduled to be removed from the kernel in 2025. +WARNING: untranslated string: reiserfs warning2 =3D Ensure a fresh installat= ion is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: release =3D Release WARNING: untranslated string: required =3D Required WARNING: untranslated string: retbleed =3D Retbleed diff --git a/doc/language_missings b/doc/language_missings index aa554c6e7..6eb960f62 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -73,6 +73,8 @@ < optional < quick control < random number generator daemon +< reiserfs warning1 +< reiserfs warning2 < required < samba server role member < samba server role standalone @@ -115,6 +117,8 @@ < invalid ip or hostname < openvpn cert expires soon < openvpn cert has expired +< reiserfs warning1 +< reiserfs warning2 < service boot setting unavailable < spec rstack overflow < transport mode does not support vti @@ -134,6 +138,8 @@ < extrahd not mounted < g.dtm < g.lite +< reiserfs warning1 +< reiserfs warning2 < spec rstack overflow < upload fcdsl.o ############################################################################ @@ -517,6 +523,8 @@ < reboot fsck < rebooting ipfire fsck < received +< reiserfs warning1 +< reiserfs warning2 < release < required < required field @@ -1056,6 +1064,8 @@ < rdns < rebooting ipfire fsck < received +< reiserfs warning1 +< reiserfs warning2 < required < required field < retbleed @@ -1934,6 +1944,8 @@ < rebooting ipfire fsck < received < red1 +< reiserfs warning1 +< reiserfs warning2 < release < required < required field @@ -2923,6 +2935,8 @@ < rebooting ipfire fsck < received < red1 +< reiserfs warning1 +< reiserfs warning2 < release < required < required field @@ -3392,6 +3406,8 @@ < reboot fsck < rebooting ipfire fsck < received +< reiserfs warning1 +< reiserfs warning2 < release < required < retbleed diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 5c384fd49..c2c0962dc 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -2,7 +2,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2014 IPFire Team = # +# Copyright (C) 2007-2023 IPFire Team = # # = # # This program is free software: you can redistribute it and/or modify = # # it under the terms of the GNU General Public License as published by = # @@ -615,6 +615,13 @@ if ( -e "/var/run/need_reboot" ) { print ""; } =20 +if ( `/bin/grep -c "reiserfs" /proc/self/mounts` > 0 ) { + print "
"; + print "

$Lang::tr{'reiserfs warning1'}"; + print "
$Lang::tr{'reiserfs warning2'}"; + print "
"; +} + &Header::closebigbox(); &Header::closepage(); =20 diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 426c019b4..90d6f7739 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2208,6 +2208,8 @@ 'refresh index page while connected' =3D> 'Refresh index.cgi page while conn= ected', 'refresh update list' =3D> 'Refresh update list', 'registered user rules' =3D> 'Talos VRT rules for registered users', +'reiserfs warning1' =3D> 'Reiserfs is deprecated and scheduled to be removed= from the kernel in 2025.', +'reiserfs warning2' =3D> 'Ensure a fresh installation is made using either e= xt4 or xfs filesystems before that date.', 'release' =3D> 'Release', 'released' =3D> 'Released', 'reload' =3D> 'reload', --=20 2.41.0 --===============2961214195600287976==--