grml-setservices: fix update-rc.d handling, grml-setlang: fix handling of check for...

diff --git a/debian/changelog b/debian/changelog
index 2ae05ba..08cbd3c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grml-scripts (0.9.36) unstable; urgency=low
+
+  * grml-setservices: execute update-rc.d commands only for present
+    software packages
+  * grml-setlang: fix handling of check for supported languages
+
+ -- Michael Prokop <mika@grml.org>  Sun,  1 Apr 2007 11:00:34 +0200
+
 grml-scripts (0.9.35) unstable; urgency=low
 
   * zsh-login: drop nocolor check as grml-quickconfig can handle

diff --git a/usr_sbin/grml-setlang b/usr_sbin/grml-setlang
index 7079e76..01977f5 100755 (executable)
--- a/usr_sbin/grml-setlang
+++ b/usr_sbin/grml-setlang
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Fre Mär 16 22:49:29 CET 2007 [mika]
+# Latest change: Sam Mär 31 23:26:35 CEST 2007 [mika]
 ################################################################################
 
 PN="$(basename $0)"
@@ -159,7 +159,7 @@ else # non-interactive
   LANGUAGE="$1"
 fi
 
-if ! grep -q "${LANGUAGE})" $LANGFUNC ; then
+if ! grep -qe "${LANGUAGE})" -qe "${LANGUAGE}|" $LANGFUNC ; then
    ewarn "Language ${LANGUAGE} not supported, using default." ; eend 0
 fi
 

diff --git a/usr_sbin/grml-setservices b/usr_sbin/grml-setservices
index be21363..c2cab41 100755 (executable)
--- a/usr_sbin/grml-setservices
+++ b/usr_sbin/grml-setservices
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Fre Mär 16 21:54:10 CET 2007 [mika]
+# Latest change: Son Apr 01 11:00:24 CEST 2007 [mika]
 ################################################################################
 
 PN="$(basename $0)"
@@ -47,29 +47,35 @@ or choose cancel.
 
 # adjust setup
 set_values(){
-  if is_value_set "mdadm"  ; then
-     update-rc.d -f mdadm remove >/dev/null 2>&1
-     update-rc.d mdadm-raid start 25 S . start 50 0 6 . >/dev/null 2>&1
-     update-rc.d mdadm defaults 25 >/dev/null 2>&1
-  else
-     update-rc.d -f mdadm remove >/dev/null 2>&1
-     update-rc.d mdadm stop 20 0 1 6 . >/dev/null 2>&1
+  if [ -n "$SRAID" ] ; then
+     if is_value_set "mdadm"  ; then
+        update-rc.d -f mdadm remove >/dev/null 2>&1
+        update-rc.d mdadm-raid start 25 S . start 50 0 6 . >/dev/null 2>&1
+        update-rc.d mdadm defaults 25 >/dev/null 2>&1
+     else
+        update-rc.d -f mdadm remove >/dev/null 2>&1
+        update-rc.d mdadm stop 20 0 1 6 . >/dev/null 2>&1
+     fi
   fi
 
-  if is_value_set "dmraid" ; then
-     update-rc.d -f dmraid remove >/dev/null 2>&1
-     update-rc.d dmraid start 04 S . start 51 0 6 . >/dev/null
-  else
-     update-rc.d -f dmraid remove >/dev/null 2>&1
-     update-rc.d dmraid stop 20 0 1 6 . >/dev/null 2>&1
+  if [ -n "$MRAID" ] ; then
+     if is_value_set "dmraid" ; then
+        update-rc.d -f dmraid remove >/dev/null 2>&1
+        update-rc.d dmraid start 04 S . start 51 0 6 . >/dev/null
+     else
+        update-rc.d -f dmraid remove >/dev/null 2>&1
+        update-rc.d dmraid stop 20 0 1 6 . >/dev/null 2>&1
+     fi
   fi
 
-  if is_value_set "dbus" ; then
-     update-rc.d -f dbus remove >/dev/null 2>&1
-     update-rc.d dbus defaults >/dev/null 2>&1
-  else
-     update-rc.d -f dbus remove >/dev/null 2>&1
-     update-rc.d dbus stop 20 0 1 6 . >/dev/null 2>&1
+  if [ -n "$DBUS" ] ; then
+     if is_value_set "dbus" ; then
+        update-rc.d -f dbus remove >/dev/null 2>&1
+        update-rc.d dbus defaults >/dev/null 2>&1
+     else
+        update-rc.d -f dbus remove >/dev/null 2>&1
+        update-rc.d dbus stop 20 0 1 6 . >/dev/null 2>&1
+     fi
   fi
 }