Attachment 295051 Details for Bug 431107 – check runlevel in halt/reboot, set --force accordingly

[patch] check runlevel in halt/reboot, set --force accordingly

upstart-runlevel.patch (text/plain), 1.15 KB, created by Bill Nottingham on 2008-02-15 23:03:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Nottingham

Created: 2008-02-15 23:03:27 UTC

Size: 1.15 KB

patch

obsolete

>diff -up upstart-0.3.9/compat/sysv/reboot.c.foo upstart-0.3.9/compat/sysv/reboot.c
>--- upstart-0.3.9/compat/sysv/reboot.c.foo	2008-02-15 16:52:30.000000000 -0500
>+++ upstart-0.3.9/compat/sysv/reboot.c	2008-02-15 17:47:37.000000000 -0500
>@@ -36,6 +36,7 @@
> #include <stdlib.h>
> #include <string.h>
> #include <unistd.h>
>+#include <utmp.h>
> 
> #include <linux/if.h>
> #include <linux/hdreg.h>
>@@ -158,12 +159,31 @@ static NihOption options[] = {
> 	NIH_OPTION_LAST
> };
> 
>+static char get_runlevel(void)
>+{
>+	struct utmp utmp, *lvl;
>+	char *rl, runlevel = 0;
>+
>+	if ((rl = getenv("RUNLEVEL")) != NULL)
>+		return *rl;
>+
>+	memset(&utmp, 0, sizeof(utmp));
>+	utmp.ut_type = RUN_LVL;
>+	setutent();
>+	lvl = getutid(&utmp);
>+	if (lvl)
>+		runlevel = lvl->ut_pid % 256;
>+	endutent();
>+	return runlevel;	
>+}
>+
> 
> int
> main (int   argc,
>       char *argv[])
> {
> 	char **args;
>+	char level;
> 	int    mode;
> 
> 	nih_main_init (argv[0]);
>@@ -211,6 +231,12 @@ main (int   argc,
> 
> 	if (exit_only)
> 		exit (0);
>+		
>+	level = get_runlevel();
>+	if (level) {
>+		if (level == '0' || level == '6')
>+			force = TRUE;
>+	}
> 
> 	/* Normally we just exec shutdown, which notifies everyone and
> 	 * signals init.

Actions: View | Diff

Attachments on bug 431107: 295051