emo/sysvinit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When the halt command is called with the -p flag (or as poweroff)

Browse Source 
the command now passes the "-h -P" flags to shutdown. This
in turn sets the INIT_HALT environment variable to POWEROFF.
Assuming this value is checked by initscripts during the
shutting down procedure, it should cause the system to
be powered off.
If halt is called without -p then the value of INIT_HALT
is not set and the default action (often set in /etc/defaut/halt)
is taken.
This commit is contained in:
Jesse Smith 2018-11-23 22:11:42 -04:00
parent c03e2fac2b
commit f0e93128bc
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/Changelog
View File

@ -5,6 +5,15 @@ sysvinit (2.93) released; urgency=low
* Fixed error where pidof would not omit checking PIDs passed * Fixed error where pidof would not omit checking PIDs passed
to it when the -o flag was used. to it when the -o flag was used.
Fixes Debian bug #913394. Fixes Debian bug #913394.
* When the halt command is called with the -p flag (or as poweroff)
the command now passes the "-h -P" flags to shutdown. This
in turn sets the INIT_HALT environment variable to POWEROFF.
Assuming this value is checked by initscripts during the
shutting down procedure, it should cause the system to
be powered off.
If halt is called without -p then the value of INIT_HALT
is not set and the default action (often set in /etc/defaut/halt)
is taken.
sysvinit (2.92) released; urgency=low sysvinit (2.92) released; urgency=low

8
src/halt.c
View File

@ -155,13 +155,15 @@ int get_runlevel(void)
/* /*
* Switch to another runlevel. * Switch to another runlevel.
*/ */
void do_shutdown(char *fl, char *tm) void do_shutdown(char *fl, int should_poweroff, char *tm)
{ {
char *args[8]; char *args[9];
int i = 0; int i = 0;
args[i++] = "shutdown"; args[i++] = "shutdown";
args[i++] = fl; args[i++] = fl;
if ( (! strcmp(fl, "-h") ) && (should_poweroff) )
args[i++] = "-P";
if (tm) { if (tm) {
args[i++] = "-t"; args[i++] = "-t";
args[i++] = tm; args[i++] = tm;
@ -259,7 +261,7 @@ int main(int argc, char **argv)
*/ */
c = get_runlevel(); c = get_runlevel();
if (c != '0' && c != '6') if (c != '0' && c != '6')
do_shutdown(do_reboot ? "-r" : "-h", tm); do_shutdown(do_reboot ? "-r" : "-h", do_poweroff, tm);
} }
/* /*