From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH 1/2] shutdown.cgi: Add "reboot with filesystem check" button Date: Wed, 14 Jul 2021 17:12:27 +0100 Message-ID: <1F196F80-AC3E-439B-8827-32EF61A7BBAD@ipfire.org> In-Reply-To: <20210713190629.91-1-hofmann@leo-andres.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5344696406601087343==" List-Id: --===============5344696406601087343== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, Does the -r switch in shutdown(8) actually work? I have never used it. Best, -Michael > On 13 Jul 2021, at 20:06, Leo-Andres Hofmann wrot= e: >=20 > ipfirereboot.c is able to force a file system check during reboot. > This patch makes this function available in the shutdown GUI. >=20 > Signed-off-by: Leo-Andres Hofmann > --- > html/cgi-bin/shutdown.cgi | 79 +++++++++++++++++++++++++++++---------- > langs/de/cgi-bin/de.pl | 2 + > langs/en/cgi-bin/en.pl | 2 + > 3 files changed, 63 insertions(+), 20 deletions(-) >=20 > diff --git a/html/cgi-bin/shutdown.cgi b/html/cgi-bin/shutdown.cgi > index e0a2c9da0..1321e158b 100644 > --- a/html/cgi-bin/shutdown.cgi > +++ b/html/cgi-bin/shutdown.cgi > @@ -1,11 +1,23 @@ > #!/usr/bin/perl > -# > -# SmoothWall CGIs > -# > -# This code is distributed under the terms of the GPL > -# > -# (c) The SmoothWall Team > -# > +##########################################################################= ##### > +# = # > +# IPFire.org - A linux based firewall = # > +# Copyright (C) 2021 IPFire Development 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 = # > +# the Free Software Foundation, either version 3 of the License, or = # > +# (at your option) any later version. = # > +# = # > +# This program is distributed in the hope that it will be useful, = # > +# but WITHOUT ANY WARRANTY; without even the implied warranty of = # > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # > +# GNU General Public License for more details. = # > +# = # > +# You should have received a copy of the GNU General Public License = # > +# along with this program. If not, see . = # > +# = # > +##########################################################################= ##### >=20 > use strict; >=20 > @@ -17,6 +29,27 @@ require '/var/ipfire/general-functions.pl'; > require "${General::swroot}/lang.pl"; > require "${General::swroot}/header.pl"; >=20 > +###--- HTML HEAD ---### > +my $extraHead =3D < + > +END > +; > +###--- END HTML HEAD ---### > + > my %cgiparams=3D(); > my $death =3D 0; > my $rebirth =3D 0; > @@ -26,33 +59,39 @@ my $rebirth =3D 0; > $cgiparams{'ACTION'} =3D ''; > &Header::getcgihash(\%cgiparams); >=20 > -if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) { > +if ($cgiparams{'ACTION'} eq "SHUTDOWN") { > $death =3D 1; > &General::log($Lang::tr{'shutting down ipfire'}); > &General::system('/usr/local/bin/ipfirereboot', 'down'); > -} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) { > +} elsif ($cgiparams{'ACTION'} eq "REBOOT") { > $rebirth =3D 1; > &General::log($Lang::tr{'rebooting ipfire'}); > &General::system('/usr/local/bin/ipfirereboot', 'boot'); > +} elsif ($cgiparams{'ACTION'} eq "REBOOT_FSCK") { > + $rebirth =3D 1; > + &General::log($Lang::tr{'rebooting ipfire fsck'}); > + &General::system('/usr/local/bin/ipfirereboot', 'bootfs'); > } > + > if ($death =3D=3D 0 && $rebirth =3D=3D 0) { >=20 > - &Header::openpage($Lang::tr{'shutdown control'}, 1, ''); > + &Header::openpage($Lang::tr{'shutdown control'}, 1, $extraHead); >=20 > &Header::openbigbox('100%', 'left'); > + &Header::openbox('100%', 'left'); >=20 > - print "
\n"; > - > - &Header::openbox('100%', 'left', ); > print < - > - > - > - > - > -
> + > + > + > + > + > + > + > +
> + > END > - ; > +; > &Header::closebox(); >=20 > } else { > diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl > index 0d2228ede..76bf0469d 100644 > --- a/langs/de/cgi-bin/de.pl > +++ b/langs/de/cgi-bin/de.pl > @@ -2085,11 +2085,13 @@ > 'real address' =3D> 'Reale Addresse', > 'reboot' =3D> 'Neustart', > 'reboot ask' =3D> 'Neustart?', > +'reboot fsck' =3D> 'Neustart & Dateisystem-Test', > 'reboot question' =3D> 'Extra Abfrage bei neustart und herunterfahren einsc= halten', > 'reboot schedule' =3D> 'Zeitsteuerung f=C3=BCr IPFire Neustarts', > 'reboot sure' =3D> 'Sind Sie sicher, dass Sie neustarten wollen?', > 'rebooting' =3D> 'Starte neu ...', > 'rebooting ipfire' =3D> 'Starte IPFire neu', > +'rebooting ipfire fsck' =3D> 'Starte IPFire neu, Dateisystem-Test erzwinge= n', > 'received' =3D> 'Empfangen', > 'reconnect' =3D> 'Neu Verbinden', > 'reconnection' =3D> 'Wiederverbindung', > diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl > index 2ba6961f3..181dc80b0 100644 > --- a/langs/en/cgi-bin/en.pl > +++ b/langs/en/cgi-bin/en.pl > @@ -2120,11 +2120,13 @@ > 'real address' =3D> 'Real Address', > 'reboot' =3D> 'Reboot', > 'reboot ask' =3D> 'Reboot?', > +'reboot fsck' =3D> 'Reboot & check filesystem', > 'reboot question' =3D> 'Extra query for restart and shutdown', > 'reboot schedule' =3D> 'Schedule IPFire reboots', > 'reboot sure' =3D> 'Are you sure that you want to reboot?', > 'rebooting' =3D> 'Rebooting', > 'rebooting ipfire' =3D> 'Rebooting IPFire', > +'rebooting ipfire fsck' =3D> 'Rebooting IPFire, forcing filesystem check', > 'received' =3D> 'Received', > 'reconnect' =3D> 'Reconnect', > 'reconnection' =3D> 'Reconnection', > --=20 > 2.27.0.windows.1 >=20 --===============5344696406601087343==--