sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Andraž Levstik (c594fb01b1f96926a04f3769e1dcd90abc53e4c7)
- From: Andraž Levstik <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (c594fb01b1f96926a04f3769e1dcd90abc53e4c7)
- Date: Fri, 3 Apr 2009 13:36:10 -0500
GIT changes to master grimoire by Andraž Levstik <ruskie AT codemages.net>:
kernels/hibernate-script/HISTORY | 2 +-
kernels/hibernate-script/scriptlets.d.diff | 16 ----------------
2 files changed, 1 insertion(+), 17 deletions(-)
New commits:
commit c594fb01b1f96926a04f3769e1dcd90abc53e4c7
Author: Andraž Levstik <ruskie AT codemages.net>
Commit: Andraž Levstik <ruskie AT codemages.net>
hibernate-script: minor fix
diff --git a/kernels/hibernate-script/HISTORY
b/kernels/hibernate-script/HISTORY
index 5a7c6e6..d13f34e 100644
--- a/kernels/hibernate-script/HISTORY
+++ b/kernels/hibernate-script/HISTORY
@@ -7,7 +7,7 @@
* sourcemage-help.patch: removed
* sourcemage-services.patch: removed
* hibernate.diff: Source Mage support upstream reported
- * scriptlets.d.diff: Source Mage support upstream reported
+ * scriptlets.d.diff: Source Mage support upstream reported, forgot
set x
* install.sh.patch: fixed to not install config files
2009-01-26 David Kowis <dkowis AT shlrm.org>
diff --git a/kernels/hibernate-script/scriptlets.d.diff
b/kernels/hibernate-script/scriptlets.d.diff
index 231cad0..58bbe13 100644
--- a/kernels/hibernate-script/scriptlets.d.diff
+++ b/kernels/hibernate-script/scriptlets.d.diff
@@ -62,14 +62,6 @@ diff -Nuar scriptlets.d.orig/network scriptlets.d/network
diff -Nuar scriptlets.d.orig/services scriptlets.d/services
--- scriptlets.d.orig/services 2009-04-02 20:58:49.000000000 +0200
+++ scriptlets.d/services 2009-04-03 19:41:21.000000000 +0200
-@@ -64,6 +64,7 @@
- }
-
- ServicesDetectDistro() {
-+ set -x
- # Use either a given $DISTRIBUTION or autodetect one.
- case "$DISTRIBUTION" in
- gentoo)
@@ -75,6 +76,9 @@
debian|ubuntu|redhat|fedora)
INITDIR=/etc/init.d
@@ -92,11 +84,3 @@ diff -Nuar scriptlets.d.orig/services scriptlets.d/services
if [ "$action" = "start" ] ; then
tmp=`echo $INITDIR/../rc${SERVICES_RUNLEVEL}.d/K??$service`
[ -x "$tmp" ] && return 101
-@@ -117,6 +124,7 @@
- $cmd
- }
- fi
-+ set +x
- return 0
- }
-
- [SM-Commit] GIT changes to master grimoire by Andraž Levstik (c594fb01b1f96926a04f3769e1dcd90abc53e4c7), Andraž Levstik, 04/03/2009
Archive powered by MHonArc 2.6.24.