X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-x;h=4d1ebf5087ca0309c364fa20c9668f46485b827d;hb=052811b5c51886cfe6b596a6f514371d4c11d538;hp=c36b04daaa29a32fa6a80a21715c599e91c8772c;hpb=de43fe6a318e2deff00feb4e33ce31096df9b8f0;p=grml-x.git

diff --git a/grml-x b/grml-x
index c36b04d..4d1ebf5 100755
--- 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
@@ -724,16 +727,16 @@ Section "Module"
         Load  "dbe"       # double buffer extension
         Load  "dri"       # direct rendering
         Load  "glx"       # 3D layer / GLX extension
-        Load  "type1"     # type1 font module
-        Load  "freetype"  # freetype fonts rendering
         Load  "extmod"    # some commonly used server extensions (e.g. shape extension)
         Load  "record"    # recording extension
         Load  "evdev"     # generic input handling driver on Linux
         Load  "xtrap"     # X Trap extension
-        # Load  "vbe"       # Vesa BIOS Extension
+        # Load  "freetype"  # freetype fonts rendering
         # Load  "i2c"       # I2C bus
         # Load  "int10"     # initialize graphics cards via int10 call to the BIOS
+        # Load  "type1"     # type1 font module
         # Load  "v4l"       # Video for Linux
+        # Load  "vbe"       # Vesa BIOS Extension
         ## Deprecated/unneeded modules with Xorg >=7.0:
         # Load  "speedo"    # font module (does not exist anymore)
         # Load  "ddc"       # ddc probing of monitor (automatically loaded)