[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r444 - trunk/debian



Author: dnusinow
Date: 2005-07-30 17:12:36 -0500 (Sat, 30 Jul 2005)
New Revision: 444

Added:
   trunk/debian/xserver-xorg.init
Modified:
   trunk/debian/TODO
   trunk/debian/changelog
Log:
- Add xserver-xorg.init script that will allow people (intended for
  LiveCD's) to generate an xorg.conf on the fly at bootup. Thanks Petter
  Reinholdtsen


Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO	2005-07-30 22:00:58 UTC (rev 443)
+++ trunk/debian/TODO	2005-07-30 22:12:36 UTC (rev 444)
@@ -17,10 +17,6 @@
 
 * Update i810 driver from Alan Hourthaine and any other drivers people provided
   patches to ship
-  
-* Provide ability for X.Org to generate config file each time on boot for
-  LiveCD use (suggested by Petter Reinholdtsen. David has the example script he
-  sent that provides this.)
 
 xorg-x11 6.9 (experimental)
 ---------------------------

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-07-30 22:00:58 UTC (rev 443)
+++ trunk/debian/changelog	2005-07-30 22:12:36 UTC (rev 444)
@@ -19,6 +19,9 @@
      - Ship extramodes file in xserver-xorg examples
      - Allow xfree86-common package to purge cleanly by adding a '-f' to
        update-rc.d call in postrm. Thanks Enrico Zinni.
+     - Add xserver-xorg.init script that will allow people (intended for
+       LiveCD's) to generate an xorg.conf on the fly at bootup. Thanks Petter
+       Reinholdtsen
      - Apply various GNU/kFreeBSD updates. Thanks Robert Millan and Aurelien
        Jarno. Closes: #318934
        - Remove all the old GNU/kFreeBSD support files

Added: trunk/debian/xserver-xorg.init
===================================================================
--- trunk/debian/xserver-xorg.init	2005-07-30 22:00:58 UTC (rev 443)
+++ trunk/debian/xserver-xorg.init	2005-07-30 22:12:36 UTC (rev 444)
@@ -0,0 +1,39 @@
+#! /bin/sh
+# /etc/init.d/xorg
+#
+# chkconfig: 2345 52 78
+# description: Genererate X configuration at boot time
+# $Id$
+
+et -e
+
+GENERATE_XCFG_AT_BOOT=
+
+if [ -f /etc/default/xorg ] ; then
+    . /etc/default/xorg
+fi
+
+do_start() {
+    if [ true = "$GENERATE_XCFG_AT_BOOT" ] && [ -e /etc/X11/xorg.conf ] ; then
+        logger -p user.info -t xorg "Generating new X config file."
+        echo "Generating X.org config file."
+
+	# We very likely need sudo for this. If I can get confirmation from a
+	# liveCD maker, I'll add it or whatever is needed.
+	dpkg-reconfigure -phigh xserver-xorg
+    fi
+}
+
+case "$1" in
+    start)
+        do_start
+        ;;
+    stop|restart|force-reload|status)
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|restart|force-reload|status}"
+        exit 2
+        ;;
+esac
+exit 0
+



Reply to: