diff options
| author | Arwed von Merkatz | 2007-02-28 22:27:32 +0100 |
|---|---|---|
| committer | Jeremy Blosser | 2007-02-28 16:35:49 -0600 |
| commit | b4778dd480a3e49354a69c7840cda0cb7e70c620 (patch) | |
| tree | 87247446a2c07c4aa9c191f3160547f3ceeca45f | |
| parent | 988f3647fae949f25c6b6be7aa49179c7065cc89 (diff) | |
simpleinit-msb: fixed to display messages on shutdown again, bug 13114
(cherry picked from commit 5ed4665d40b9da21e4e1291329022fd0f3899141)
| -rwxr-xr-x | smgl/simpleinit-msb/DETAILS | 2 | ||||
| -rw-r--r-- | smgl/simpleinit-msb/HISTORY | 6 | ||||
| -rwxr-xr-x | smgl/simpleinit-msb/PRE_BUILD | 1 | ||||
| -rw-r--r-- | smgl/simpleinit-msb/simpleinit-output-on-shutdown.patch | 12 |
4 files changed, 20 insertions, 1 deletions
diff --git a/smgl/simpleinit-msb/DETAILS b/smgl/simpleinit-msb/DETAILS index 923f1d08c2..892dd00afc 100755 --- a/smgl/simpleinit-msb/DETAILS +++ b/smgl/simpleinit-msb/DETAILS @@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_HASH=sha512:e31b517d7da11c91b93d03808b5bec663973e4b4ea07b2451dcb9ccb6034eca8e79e1226ff62d527421070123d339106db354220e2c7a0393cd9c99d2a4e62e0 WEB_SITE=http://www.winterdrache.de/linux/newboot/ ENTERED=20030505 - PATCHLEVEL=1 + PATCHLEVEL=2 LICENSE[0]=GPL KEYWORDS="smgl" SHORT="Replacement for SysVinit" diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY index 542954c54e..6ae9593649 100644 --- a/smgl/simpleinit-msb/HISTORY +++ b/smgl/simpleinit-msb/HISTORY @@ -1,3 +1,9 @@ +2007-02-28 Arwed v. Merkatz <v.merkatz@gmx.net> + * PRE_BUILD, simpleinit-output-on-shutdown.patch: + patch to fix bug 13114, simpleinit now displaying script output + while doing a rollback/shutdown + * DETAILS: PATCHLEVEL++ + 2006-11-19 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> * BUILD: added removal of NLS * CONFIGURE: query for static, removed NLS query diff --git a/smgl/simpleinit-msb/PRE_BUILD b/smgl/simpleinit-msb/PRE_BUILD index 396bac927d..42b42fa4bc 100755 --- a/smgl/simpleinit-msb/PRE_BUILD +++ b/smgl/simpleinit-msb/PRE_BUILD @@ -5,6 +5,7 @@ patch -p0 < $SCRIPT_DIRECTORY/simpleinit-1000uid.patch && patch -p1 < $SCRIPT_DIRECTORY/simpleinit-msb-crypt.diff && patch -p0 < $SPELL_DIRECTORY/simpleinit.nonls.diff && patch -p0 < $SPELL_DIRECTORY/shutdown.nonls.diff && +patch -p0 < $SPELL_DIRECTORY/simpleinit-output-on-shutdown.patch && if [[ $SIMPLEINIT_STATIC == y ]]; then sedit 's#shutdown: shutdown.o $(LIB)/my_reboot.o $(LIB)/xstrncpy.o#shutdown: shutdown.o $(LIB)/my_reboot.o $(LIB)/xstrncpy.o\n\t$(CC) $(LDFLAGS) -o $@ $^#' login-utils/Makefile && sedit 's:$(CC) $(LDFLAGS):$(CC) -static $(LDFLAGS):g' login-utils/Makefile diff --git a/smgl/simpleinit-msb/simpleinit-output-on-shutdown.patch b/smgl/simpleinit-msb/simpleinit-output-on-shutdown.patch new file mode 100644 index 0000000000..9e537e2272 --- /dev/null +++ b/smgl/simpleinit-msb/simpleinit-output-on-shutdown.patch @@ -0,0 +1,12 @@ +--- login-utils/simpleinit.c.orig 2007-02-28 22:12:16.000000000 +0100 ++++ login-utils/simpleinit.c 2007-02-28 22:15:45.000000000 +0100 +@@ -1476,6 +1476,9 @@ + for (ival = 1; ival < NSIG; ival++) signal (ival, SIG_DFL); + sigprocmask(SIG_UNBLOCK,&all_signals,NULL); + if (!userspace){ ++ close (0); ++ close (1); ++ close (2); + open ("/dev/console", O_RDONLY, 0); + open ("/dev/console", O_RDWR, 0); + dup2 (1, 2); |