index.cgi: Add warning about reiserfs deprecation and removal if reiserfs used

- Reiserfs was stopped in IPFire in Core Update 167. It has been announced that reiserfs
   will be removed from the kernel in 2025.
- This patch gives a warning about this deprecation and removal if reiserfs is used. The
   warning also requests that the user does a re-installation using either ext4 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 <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 53e81a5d500ec4fb9f9b4d9e7a1f4deeab97b81a..4fd5a081919445c3bea147b9ae6fae455518ac8b 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -933,6 +933,8 @@ WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Dae
 WARNING: untranslated string: no entries = No entries at the moment.
 WARNING: untranslated string: optional = Optional
 WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
+WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
 WARNING: untranslated string: required = Required
 WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 97166df4f4317b11ab7ed3974b1684b09a2e717a..70eb9fbe8d4e7fae73cd8aa173a226b574794ca1 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1577,6 +1577,8 @@ WARNING: untranslated string: red1 = RED
 WARNING: untranslated string: references = References
 WARNING: untranslated string: refresh = Refresh
 WARNING: untranslated string: refresh index page while connected = Refresh index.cgi page while connected
+WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
+WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
 WARNING: untranslated string: release = Release
 WARNING: untranslated string: remark = Remark
 WARNING: untranslated string: remark title = Remark:

diff --git a/doc/language_issues.es b/doc/language_issues.es
index d755bea3e8309105482229bfb3c2354829b282f6..45ffdf5d7a897b724933ef0d81765fb820601731 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -995,6 +995,8 @@ WARNING: untranslated string: no data = unknown string
 WARNING: untranslated string: openvpn cert expires soon = Expires Soon
 WARNING: untranslated string: openvpn cert has expired = Expired
 WARNING: untranslated string: pakfire ago = ago.
+WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
+WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
 WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 0d664336a67dee61e3c4ed214db0269807b754b5..cacfb1ec6ab884a957b655f37988a4e4d56a031f 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -948,6 +948,8 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string
 WARNING: untranslated string: guardian no entries = unknown string
 WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: pakfire ago = ago.
+WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
+WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
 WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 447b71af01bc1c85f31be8c90820fd180484cccd..68ff12c8695efebaa1276038138112fdbd8c9753 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1215,6 +1215,8 @@ WARNING: untranslated string: rdns = rDNS
 WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’
 WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
 WARNING: untranslated string: received = Received
+WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
+WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
 WARNING: untranslated string: release = Release
 WARNING: untranslated string: required = Required
 WARNING: untranslated string: required field = Required field

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index dcfb8f67fea51451f9eabeea5a8ee8bd961230cd..ea0abc74cd83d340ccce866191dd21dc75451d12 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1238,6 +1238,8 @@ WARNING: untranslated string: ptr = PTR
 WARNING: untranslated string: rdns = rDNS
 WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
 WARNING: untranslated string: received = Received
+WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
+WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
 WARNING: untranslated string: required = Required
 WARNING: untranslated string: required field = Required field
 WARNING: untranslated string: retbleed = Retbleed

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index faf686b865e62bfff7023f7edd1d1eb1fba6dad9..893f73211a1614e816e11a09a40977adf2616889 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1418,6 +1418,8 @@ WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’
 WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
 WARNING: untranslated string: received = Received
 WARNING: untranslated string: red1 = RED
+WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
+WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
 WARNING: untranslated string: release = Release
 WARNING: untranslated string: required = Required
 WARNING: untranslated string: required field = Required field

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 6db59db59e007804f60a499b0bccaaa50c50aa80..64c9b50954a343d22b7fd3be3a39b780096d97db 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1413,6 +1413,8 @@ WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’
 WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
 WARNING: untranslated string: received = Received
 WARNING: untranslated string: red1 = RED
+WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
+WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
 WARNING: untranslated string: release = Release
 WARNING: untranslated string: required = Required
 WARNING: untranslated string: required field = Required field

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 7dfd3267d0f00536449ed064f27a901271ac068b..eadbd33c71d818d3dfd029bc65a5247df49365b1 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1125,6 +1125,8 @@ WARNING: untranslated string: ptr = PTR
 WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’
 WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
 WARNING: untranslated string: received = Received
+WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
+WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
 WARNING: untranslated string: release = Release
 WARNING: untranslated string: required = Required
 WARNING: untranslated string: retbleed = Retbleed

diff --git a/doc/language_missings b/doc/language_missings
index aa554c6e7afbf679a70f2ced8ceb0f082da9a686..6eb960f62b18a60ba92ea8c0d56a62e33eaefc27 100644 (file)
--- 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 5c384fd49238b3ea8782c9099e5f2f3840910bc8..c2c0962dcb1685aeb5e71536945d2df987820a90 100644 (file)
--- 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  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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 "</div>";
 }
 
+if ( `/bin/grep -c "reiserfs" /proc/self/mounts`  > 0 ) {
+        print "<div style='text-align:center; color:blue;'>";
+        print "<br/><br/>$Lang::tr{'reiserfs warning1'}";
+        print "<br/>$Lang::tr{'reiserfs warning2'}";
+        print "</div>";
+}
+
 &Header::closebigbox();
 &Header::closepage();
 

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 426c019b4eb6abeac728bb0bc0d4d9ed8a446dff..90d6f773931f065b4a5595a857dac0e4806c3ca5 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2208,6 +2208,8 @@
 'refresh index page while connected' => 'Refresh index.cgi page while connected',
 'refresh update list' => 'Refresh update list',
 'registered user rules' => 'Talos VRT rules for registered users',
+'reiserfs warning1' => 'Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.',
+'reiserfs warning2' => 'Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.',
 'release' => 'Release',
 'released' => 'Released',
 'reload' => 'reload',