From: Ulrich Dangel <mru@grml.org>
Date: Thu, 8 Dec 2011 14:46:27 +0000 (+0100)
Subject: Don't use a window manager if none is specified.
X-Git-Tag: v0.9.38~2
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=28c2a31c8e74fdecbacfec3934ef7c4f3e584d67

Don't use a window manager if none is specified.
---

diff --git a/autoconfig.functions b/autoconfig.functions
index 2f7e313..47fcc11 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1379,8 +1379,7 @@ if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; t
   if [ -z "$INSTALLED" ] ; then
    WINDOWMANAGER="$(getbootparam 'startx' 2>>$DEBUG)"
    if [ -z "$WINDOWMANAGER" ] ; then
-     einfo "No window manager specified. Taking ${WHITE}wm-ng${NORMAL} as default." && eend 0
-     WINDOWMANAGER="wm-ng"
+     einfo "No window manager specified. Using default one." && eend 0
    else
      einfo "Window manager ${WHITE}${WINDOWMANAGER}${NORMAL} found as bootoption." && eend 0
    fi
@@ -1388,7 +1387,7 @@ if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; t
    config_userfstab || fstabuser='grml'
  cat>|/etc/init.d/xstartup<<EOF
 #!/bin/sh
-su $fstabuser -c "/usr/bin/grml-x $WINDOWMANAGER"
+su $fstabuser -c "/usr/bin/grml-x"
 EOF
    chmod 755 /etc/init.d/xstartup