added config_qemu()

diff --git a/autoconfig b/autoconfig
index 56a46a6..ee88baa 100644 (file)
--- a/autoconfig
+++ b/autoconfig
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.

-# Latest change: Mit Jän 17 17:48:05 CET 2007 [mika]
+# Latest change: Son Mär 25 12:45:13 CEST 2007 [mika]

 ################################################################################
 
 ################################################################################
 ################################################################################
 
 ################################################################################


@@ -94,6 +94,7 @@ CONFIG_NETCONFIG='yes'        # download configuration archive provided by booto
 CONFIG_NETIPV6='yes'          # check for bootparam ipv6
 CONFIG_PASSWD='yes'           # set password via bootparam passwd
 CONFIG_PCMCIA='no'            # check for pcmcia and start cardmgr
 CONFIG_NETIPV6='yes'          # check for bootparam ipv6
 CONFIG_PASSWD='yes'           # set password via bootparam passwd
 CONFIG_PCMCIA='no'            # check for pcmcia and start cardmgr

+CONFIG_QEMU='yes'             # qemu specific stuff

 CONFIG_SERVICES='yes'         # check for services to run, provided via bootparam
 CONFIG_SETKEYCODES='yes'      # run setkeycodes when bootoption setkeycodes found
 CONFIG_SMALL='yes'            # use a less "bloat" /etc/inittab for small computer with less RAM
 CONFIG_SERVICES='yes'         # check for services to run, provided via bootparam
 CONFIG_SETKEYCODES='yes'      # run setkeycodes when bootoption setkeycodes found
 CONFIG_SMALL='yes'            # use a less "bloat" /etc/inittab for small computer with less RAM

diff --git a/autoconfig.functions b/autoconfig.functions
index cb9b1df..8b872af 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -385,16 +385,29 @@ config_kernel(){
 # {{{ vmware specific stuff
 config_vmware(){
 if checkbootparam novmware ; then
 # {{{ vmware specific stuff
 config_vmware(){
 if checkbootparam novmware ; then

- ewarn "Skipping running vmware specific stuff as requested on boot commandline." ; eend 0
+   ewarn "Skipping running vmware specific stuff as requested on boot commandline." ; eend 0

 else
 else

- if [ -z "$INSTALLED" ]; then
-  if vmware-detect ; then
-    if [ -r /etc/X11/xorg.conf.vmware ] ; then
-      einfo "Copying /etc/X11/xorg.conf.vmware to /etc/X11/xorg.conf"
-      cp /etc/X11/xorg.conf.vmware /etc/X11/xorg.conf ; eend $?
-    fi
-  fi
- fi
+   if [ -z "$INSTALLED" ] ; then
+      if ! [ checkbootparam qemu ]; then
+         if vmware-detect ; then
+            if [ -r /etc/X11/xorg.conf.vmware ] ; then
+               einfo "Copying /etc/X11/xorg.conf.vmware to /etc/X11/xorg.conf"
+               cp /etc/X11/xorg.conf.vmware /etc/X11/xorg.conf ; eend $?
+            fi
+        fi
+      fi
+   fi
+fi
+}
+# }}}
+
+# {{{ qemu specific stuff
+config_qemu(){
+if checkbootparam qemu ; then
+   if [ -r /etc/X11/xorg.conf.example ] ; then
+      einfo "Copying /etc/X11/xorg.conf.example to /etc/X11/xorg.conf"
+      cp /etc/X11/xorg.conf.example /etc/X11/xorg.conf ; eend $?
+   fi

 fi
 }
 # }}}
 fi
 }
 # }}}

diff --git a/autoconfig.small b/autoconfig.small
index ac62f87..199a937 100644 (file)
--- a/autoconfig.small
+++ b/autoconfig.small
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.

-# Latest change: Mit Jän 17 17:48:02 CET 2007 [mika]
+# Latest change: Son Mär 25 12:45:17 CEST 2007 [mika]

 ################################################################################
 
 ################################################################################
 ################################################################################
 
 ################################################################################


@@ -94,6 +94,7 @@ CONFIG_NETCONFIG='yes'        # download configuration archive provided by booto
 CONFIG_NETIPV6='yes'          # check for bootparam ipv6
 CONFIG_PASSWD='yes'           # set password via bootparam passwd
 CONFIG_PCMCIA='no'            # check for pcmcia and start cardmgr
 CONFIG_NETIPV6='yes'          # check for bootparam ipv6
 CONFIG_PASSWD='yes'           # set password via bootparam passwd
 CONFIG_PCMCIA='no'            # check for pcmcia and start cardmgr

+CONFIG_QEMU='no'              # qemu specific stuff

 CONFIG_SERVICES='yes'         # check for services to run, provided via bootparam
 CONFIG_SETKEYCODES='yes'      # run setkeycodes when bootoption setkeycodes found
 CONFIG_SMALL='yes'            # use a less "bloat" /etc/inittab for small computer with less RAM
 CONFIG_SERVICES='yes'         # check for services to run, provided via bootparam
 CONFIG_SETKEYCODES='yes'      # run setkeycodes when bootoption setkeycodes found
 CONFIG_SMALL='yes'            # use a less "bloat" /etc/inittab for small computer with less RAM

diff --git a/debian/changelog b/debian/changelog
index 17265e0..9bb8cd7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.6.23) unstable; urgency=low
+
+  * Added config_qemu() which currently does nothing else than
+    copying /etc/X11/xorg.conf.example to /etc/X11/xorg.conf.
+
+ -- Michael Prokop <mika@grml.org>  Sun, 25 Mar 2007 12:45:41 +0200
+

 grml-autoconfig (0.6.22) unstable; urgency=low
 
   * config_time(): check for existing /dev/rtc, display only
 grml-autoconfig (0.6.22) unstable; urgency=low
 
   * config_time(): check for existing /dev/rtc, display only

diff --git a/grml-autoconfig b/grml-autoconfig
index a45d7c6..5500fde 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.

-# Latest change: Fre Aug 04 12:13:13 CEST 2006 [mika]
+# Latest change: Son Mär 25 12:45:38 CEST 2007 [mika]

 ################################################################################
 
 # http://wiki.debian.org/LSBInitScripts =>
 ################################################################################
 
 # http://wiki.debian.org/LSBInitScripts =>


@@ -111,6 +111,8 @@ checkvalue $CONFIG_KERNEL &&  config_kernel
 
 checkvalue $CONFIG_VMWARE &&  config_vmware
 
 
 checkvalue $CONFIG_VMWARE &&  config_vmware
 

+checkvalue $CONFIG_QEMU && config_qemu
+

 checkvalue $CONFIG_SMALL && config_small
 
 checkvalue $CONFIG_LD_MOD && config_ld_mod
 checkvalue $CONFIG_SMALL && config_small
 
 checkvalue $CONFIG_LD_MOD && config_ld_mod