From d4e54d262cb959609e5d815a4125676a9e98dfb8 Mon Sep 17 00:00:00 2001
From: Ulrich Dangel <mru@grml.org>
Date: Sun, 21 Nov 2010 12:57:07 +0100
Subject: [PATCH] Remove startx and xinit functions

Current X11 versions as well as the current grml-x version do
not longer need a configuration file. Therefore the xinit/startx
functions are not longer needed.

The decision to switch to a config less xorg environment was made at the
grml developer meeting http://grml.org/reports/devmeeting_2010/ and a the
new grml-x packet is already uploaded to grml-testing.
---
 doc/grmlzshrc.t2t | 10 ----------
 etc/zsh/zshrc     | 22 ----------------------
 2 files changed, 32 deletions(-)

diff --git a/doc/grmlzshrc.t2t b/doc/grmlzshrc.t2t
index a2bc5b8..8abdf32 100644
--- a/doc/grmlzshrc.t2t
+++ b/doc/grmlzshrc.t2t
@@ -880,11 +880,6 @@ Example usage:
 % Restart ssh
 ```
 
-: **startx()**
-Initializes an X session using startx(1) if /etc/X11/xorg.conf exists, else
-issues a Warning to use the grml-x(1) script. Can be overridden by using
-/usr/bin/startx directly.
-
 : **status()**
 Shows some information about current system status.
 
@@ -958,11 +953,6 @@ first argument. The optional second argument denotes the distribution
 Tries to cat(1) file(s) given as parameter(s). Always returns true.
 See also xunfunction() below.
 
-: **xinit()**
-Initializes an X session using xinit(1) if /etc/X11/xorg.conf exists, else
-issues a Warning to use the grml-x(1) script. Can be overridden by using
-/usr/bin/xinit directly.
-
 : **xsource()**
 Tries to source the file(s) given as parameter(s). Always returns true.
 See zshbuiltins(1) for a detailed description of the source command.
diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 40f58d5..068e10c 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -2632,28 +2632,6 @@ grmlcomp() {
 # {{{ grmlstuff
 grmlstuff() {
 # people should use 'grml-x'!
-    startx() {
-        if [[ -e /etc/X11/xorg.conf ]] ; then
-            [[ -x /usr/bin/startx ]] && /usr/bin/startx "$@" || /usr/X11R6/bin/startx "$@"
-        else
-            echo "Please use the script \"grml-x\" for starting the X Window System
-because there does not exist /etc/X11/xorg.conf yet.
-If you want to use startx anyway please call \"/usr/bin/startx\"."
-            return -1
-        fi
-    }
-
-    xinit() {
-        if [[ -e /etc/X11/xorg.conf ]] ; then
-            [[ -x /usr/bin/xinit ]] && /usr/bin/xinit || /usr/X11R6/bin/xinit
-        else
-            echo "Please use the script \"grml-x\" for starting the X Window System.
-because there does not exist /etc/X11/xorg.conf yet.
-If you want to use xinit anyway please call \"/usr/bin/xinit\"."
-            return -1
-        fi
-    }
-
     if check_com -c 915resolution; then
         855resolution() {
             echo "Please use 915resolution as resolution modifying tool for Intel \
-- 
2.1.4