Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (5ed4665d40b9da21e4e1291329022fd0f3899141)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (5ed4665d40b9da21e4e1291329022fd0f3899141)
  • Date: Wed, 28 Feb 2007 15:30:56 -0600

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

smgl/simpleinit-msb/DETAILS | 2 +-
smgl/simpleinit-msb/HISTORY | 6 ++++++
smgl/simpleinit-msb/PRE_BUILD | 1 +
smgl/simpleinit-msb/simpleinit-output-on-shutdown.patch | 12 ++++++++++++
4 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 5ed4665d40b9da21e4e1291329022fd0f3899141
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

simpleinit-msb: fixed to display messages on shutdown again, bug 13114

diff --git a/smgl/simpleinit-msb/DETAILS b/smgl/simpleinit-msb/DETAILS
index 923f1d0..892dd00 100755
--- a/smgl/simpleinit-msb/DETAILS
+++ b/smgl/simpleinit-msb/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

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 542954c..6ae9593 100644
--- a/smgl/simpleinit-msb/HISTORY
+++ b/smgl/simpleinit-msb/HISTORY
@@ -1,3 +1,9 @@
+2007-02-28 Arwed v. Merkatz <v.merkatz AT 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 AT 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 396bac9..42b42fa 100755
--- a/smgl/simpleinit-msb/PRE_BUILD
+++ b/smgl/simpleinit-msb/PRE_BUILD
@@ -5,6 +5,7 @@ patch -p0 < $SCRIPT_DIRECTORY/simplei
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 0000000..9e537e2
--- /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);



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (5ed4665d40b9da21e4e1291329022fd0f3899141), Arwed von Merkatz, 02/28/2007

Archive powered by MHonArc 2.6.24.

Top of Page