From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] Add ability for filesystem check and restart network through GUI Date: Thu, 20 Aug 2015 22:34:29 +0100 Message-ID: <1440106469.2322.36.camel@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6416043058287270445==" List-Id: --===============6416043058287270445== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Hi, thank you for submitting this patch. On Thu, 2015-08-20 at 06:54 -0700, Osmar Gonzalez wrote: > Just on the side note I added the function of restarting the network > stack through the GUI only because I find useful at times when the > DNS might be stall or when in DHCP mode the IP address wasn't > renewed, simply restarting the network stack helps in fixing minor > problems here in there without the need to login through SSH or CLI > to restart I think that this should rather not happen and if so we should look for fixing any issues that are causing this, but I have no objections to the change if you need it. What is the reason for the FS check? The system should perform them when ever needed. Other than that there is really no reason to why the user should trigger that. Best, -Michael > diff --git a/html/cgi-bin/shutdown.cgi b/html/cgi-bin/shutdown.cgi > index 998f9f8..fa66962 100644 > --- a/html/cgi-bin/shutdown.cgi > +++ b/html/cgi-bin/shutdown.cgi > @@ -34,6 +34,13 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) > { > $rebirth = 1; > &General::log($Lang::tr{'rebooting ipfire'}); > system '/usr/local/bin/ipfirereboot boot'; > +} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'reboot_net'}) { > + &General::log($Lang::tr{'rebooting network'}); > + system '/usr/local/bin/ipfirereboot network &> /dev/null'; > +} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'reboot_fs'}) { > + $rebirth = 1; > + &General::log($Lang::tr{'rebooting fs'}); > + system '/usr/local/bin/ipfirereboot bootfs'; > } > if ($death == 0 && $rebirth == 0) { > > @@ -51,6 +58,12 @@ if ($death == 0 && $rebirth == 0) { > name='ACTION' value='$Lang::tr{'shutdown'}' /> > > > + > + > + > + > + > +
name='ACTION' value='$Lang::tr{'reboot_net'}' /> name='ACTION' value='$Lang::tr{'reboot_fs'}' />
> END > ; > &Header::closebox(); > @@ -85,4 +98,3 @@ END > > &Header::closebigbox(); > &Header::closepage(); > - > diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl > index af7fda9..a2ba697 100644 > --- a/langs/en/cgi-bin/en.pl > +++ b/langs/en/cgi-bin/en.pl > @@ -1917,8 +1917,12 @@ > 'reboot question' => 'Extra query for restart and shutdown', > 'reboot schedule' => 'Schedule IPFire reboots', > 'reboot sure' => 'Are you sure that you want to reboot?', > +'reboot_fs' => 'File Systemcheck', This is spelled "Filesystem check". A verb would also help, like "Perform a filesystem check". > +'reboot_net' => 'Reboot Network', This should better be called "Restart network" because the system is not rebooted. > 'rebooting' => 'Rebooting', > +'rebooting fs' => 'Rebooting with filesystem check.', > 'rebooting ipfire' => 'Rebooting IPFire', > +'rebooting network' => 'Rebooting Network', > 'reconnect' => 'Reconnect', > 'reconnection' => 'Reconnection', > 'red' => 'Internet', > diff --git a/src/misc-progs/ipfirereboot.c b/src/misc > -progs/ipfirereboot.c > index 5e75879..5f11ba3 100644 > --- a/src/misc-progs/ipfirereboot.c > +++ b/src/misc-progs/ipfirereboot.c > @@ -29,7 +29,8 @@ > > /* define operations */ > #define OP_REBOOT "boot" > -#define OP_REBOOT_FS "bootfs" // add filesystem check > option (not yet in GUI) > +#define OP_REBOOT_FS "bootfs" > +#define OP_REBOOT_NETWORK "network" > #define OP_SHUTDOWN "down" > #define OP_SCHEDULE_ADD "cron+" > #define OP_SCHEDULE_REM "cron-" > @@ -66,6 +67,13 @@ int main(int argc, char**argv) > return 0; > } > > + if (argc==2 && strcmp(argv[1], OP_REBOOT_NETWORK)==0) > + { > + safe_system("/etc/rc.d/init.d/network stop"); > + safe_system("/etc/rc.d/init.d/network start"); > + return 0; > + } > + > // output schedule to stdout > if (argc==2 && strcmp(argv[1], OP_SCHEDULE_GET)==0) > { > --===============6416043058287270445== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEKCmlRSWNCQUFC Q2dBR0JRSlYxa2ZsQUFvSkVJQjU4UDl2a0FrSFB3UVAvMGZOWkxFbU9YNVR0VWcxendhOHFOZVIK UzhvODRjWnZEYUZUVEYwMlh1OTdqaVE0RFovcUg0WDlMMTRjLzlFcWs1QWZuaEFWTzdUYkx3ZkhP NWR4WDg2UgpBUW52WWVLKzk0ZGc0TWZiemJEazBCVzhSZmVhalZIdUU1WlcyajVjZzJldk4vaE1m ZU1qWVpZNitBcnI2UGpqCkZIREN2VkNQNlRGWm5wSkRBTTZKUDd2M3FZdnBaNFRJWmtObkx2THA2 NGg4b2I3SkF5N2R0QnhHQVpDVnJiaFcKL1dFVG9HS0l6MTNFcUcwWWJHb3ZidGt1bnc5ZndIMlpz NlJZY1NzckFkUDUxcVRMYTlNcVFuZ0F2Q1NFOTFQUAo0MXltdFpiMys4TUV3VmJTeURxN050Ukln UklmSlc3TGV5U2YvR29Bamo0dHpWcUFoQ1IxMnRzWDQzV0N2V3AzCnlkSFUwWkh2S0ptSEpBLytR S0FMVEVlNFU1TDhCOVNybEpuSUVsZm5GcXpYckQ1VER2QlN5R2U0VzJiZXRPQnMKT1o3dDQ0T1hw SDdPdHpqMGxLYmVuYUphY2FJSUJzRXhQeUtEN1BHNWlBWXdGRlJmSzRjendEaVN2VmNXaHNjUwpt cWFlVU5UTU9NSUFtM0hrY2V0SWFqakJ3cWxCVVJSRmRKWkE0Vm8wSVQwK0VubTc5SS81dFdEL0dQ UHFqUmpSCjh2MHF5L004aXRnZm44cEM2ZXh2UXR3S0hBT3hKc3dvOEpYWElSbU5hbng1NTNBdUpX TTJtMFhlK0srTGVTQWQKb3dBSC9xUk5nOStJRzhOdnJhY0NESkNzUFJxSllCMXprSm5SbjlsdnU5 Z0dINkpDYURCcng5amFwUTFGNTVibApSaC9DZmt6Q0ZKcnA3MWFWVjFPSwo9Y1ZwNwotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============6416043058287270445==--