Use grml-core for bootparameter handling.

diff --git a/debian/control b/debian/control
index a126bf5..b4c8598 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.grml.org/?p=grml-x.git
 
 Package: grml-x
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg | xserver, hwinfo, grml-etc (>= 0.5-20), grml-etc-core (>= 0.2.46), zsh, pciutils, sudo, grml-shlib, bc, x11-xkb-utils, x11-xserver-utils, xauth, xinit
+Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg | xserver, hwinfo, grml-etc (>= 0.5-20), grml-core, grml-etc-core (>= 0.2.46), zsh, pciutils, sudo, grml-shlib, bc, x11-xkb-utils, x11-xserver-utils, xauth, xinit
 Recommends: fluxbox | x-window-manager, xterm | x-terminal-emulator, xfonts-base, xserver-xorg-input-vmmouse, xcursor-themes, x11-utils
 Suggests: xfonts-100dpi, xfonts-75dpi, fonts-ttf-west-european, xfonts-base-transcoded
 Conflicts: grml-scripts (<= 0.4-4)

diff --git a/grml-x b/grml-x
index 6cf4906..4d1ebf5 100755 (executable)
--- a/grml-x
+++ b/grml-x
@@ -6,6 +6,9 @@
 # License:       This file is licensed under the GPL v2.
 ################################################################################
 
+
+. /usr/lib/grml/core.sh
+
 # debugging {{{
 # usage: DEBUG=1 grml-x ..... 2>/tmp/grml-x-debug.log
   if [[ $DEBUG -gt 0 ]]; then
@@ -15,7 +18,7 @@
 
 # functions and color {{{
   # use colors only if not booted with nocolor bootoption
-  if ! grep -q nocolor /proc/cmdline ; then
+  if ! checkbootparam nocolor ; then
      autoload colors ; colors
      [ -r /etc/grml_colors ] && . /etc/grml_colors
   fi