Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (1b1cf232f72479eefdc007c9fcf45397655ebda6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (1b1cf232f72479eefdc007c9fcf45397655ebda6)
  • Date: Wed, 25 Jun 2014 07:30:29 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

smgl/simpleinit-msb/DETAILS | 1 +
smgl/simpleinit-msb/HISTORY | 6 ++++++
smgl/simpleinit-msb/PRE_BUILD | 1 +
smgl/simpleinit-msb/simpleinit-poweroff.patch | 15 +++++++++++++++
4 files changed, 23 insertions(+)

New commits:
commit 1b1cf232f72479eefdc007c9fcf45397655ebda6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

simpleinit-msb: fixed critical segfault on invoking from Xen (as a guest
HVM DomU)

diff --git a/smgl/simpleinit-msb/DETAILS b/smgl/simpleinit-msb/DETAILS
index 1890d64..3d9fa61 100755
--- a/smgl/simpleinit-msb/DETAILS
+++ b/smgl/simpleinit-msb/DETAILS
@@ -1,5 +1,6 @@
SPELL=simpleinit-msb
VERSION=1.3
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://sourcemage.ru/mirror/$SOURCE
diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY
index 4caf329..c643641 100644
--- a/smgl/simpleinit-msb/HISTORY
+++ b/smgl/simpleinit-msb/HISTORY
@@ -1,3 +1,9 @@
+2014-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: apply patch
+ * simpleinit-poweroff.patch: added, to fix critical segfault on
invoking
+ from Xen (as a guest HVM DomU)
+
2011-05-12 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply simpleinit-ftbfs-define-enoictlcmd.patch
* simpleinit-ftbfs-define-enoictlcmd.patch: Define ENOIOCTLCMD for
diff --git a/smgl/simpleinit-msb/PRE_BUILD b/smgl/simpleinit-msb/PRE_BUILD
index 0855fbe..ef5f755 100755
--- a/smgl/simpleinit-msb/PRE_BUILD
+++ b/smgl/simpleinit-msb/PRE_BUILD
@@ -7,6 +7,7 @@ patch -p0 < "$SPELL_DIRECTORY/simpleinit-msb-crypt.patch" &&
patch -p0 < "$SPELL_DIRECTORY/simpleinit-output-on-shutdown.patch" &&
patch -p0 < "$SPELL_DIRECTORY/simpleinit-selinux.patch" &&
patch -p0 < "$SPELL_DIRECTORY/simpleinit-nonls.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/simpleinit-poweroff.patch" &&
message "${MESSAGE_COLOR}Apply linux 2.6.38+ headers
patch...${DEFAULT_COLOR}" &&
patch -p1 < "$SPELL_DIRECTORY/simpleinit-ftbfs-define-enoictlcmd.patch" &&

diff --git a/smgl/simpleinit-msb/simpleinit-poweroff.patch
b/smgl/simpleinit-msb/simpleinit-poweroff.patch
new file mode 100644
index 0000000..315d325
--- /dev/null
+++ b/smgl/simpleinit-msb/simpleinit-poweroff.patch
@@ -0,0 +1,15 @@
+--- login-utils/shutdown.c.orig 2014-06-25 15:09:23.000000000 +0400
++++ login-utils/shutdown.c 2014-06-25 15:11:12.534462171 +0400
+@@ -210,10 +210,10 @@
+ prog = argv[0];
+ if((ptr = strrchr(argv[0], '/'))) prog = ++ptr;
+
+- /* All names (halt, reboot, fasthalt, fastboot, shutdown)
++ /* All names (halt, poweroff, reboot, fasthalt, fastboot, shutdown)
+ refer to the same program with the same options,
+ only the defaults differ. */
+- if(!strcmp("halt", prog)) {
++ if(!strcmp("halt", prog) || !strcmp("poweroff", prog)) {
+ opt_reboot = 0;
+ opt_quiet = 1;
+ opt_fast = 0;



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (1b1cf232f72479eefdc007c9fcf45397655ebda6), Vlad Glagolev, 06/25/2014

Archive powered by MHonArc 2.6.24.

Top of Page