additional check in config_vmware, added config_distri()

diff --git a/autoconfig b/autoconfig
index ee88baa..45f3d0d 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.
-# Latest change: Son Mär 25 12:45:13 CEST 2007 [mika]
+# Latest change: Mit Apr 04 21:33:40 CEST 2007 [mika]
 ################################################################################
 
 ################################################################################
@@ -58,26 +58,26 @@ CONFIG_BLIND='yes'            # check for blind option or brltty
 CONFIG_CDROM_PERM='yes'       # for burning on IDE-CD-Roms, k3b (and others) check for special permissions
 CONFIG_CDROM_SCRIPTS='yes'    # run scripts from /cdrom/scripts
 CONFIG_CONSOLE='yes'          # activate mgetty when using console=... as bootparam
-CONFIG_DMA='yes'              # Enable DMA for all IDE drives
 CONFIG_CREATE_MNT_DIRS='no'   # create /mnt-directories
 CONFIG_DEBNET='yes'           # search for /etc/network/interfaces on partitions and set up network afterwards
 CONFIG_DEBS='yes'             # check for bootoption debs for installing .debs
 CONFIG_DEBUG='yes'            # activate start of shells during startup at several stages
 CONFIG_DISCOVER='no'          # use discover for hardware detection
 CONFIG_DISTCC='yes'           # activate and setup distcc through bootparam distcc=$NETWORK,$INTERFACE
+CONFIG_DISTRI='yes'           # support some customization via bootoption distri
+CONFIG_DMA='yes'              # Enable DMA for all IDE drives
 CONFIG_EXTRACT='yes'          # specify which (only in combination with bootparam myconfig/netconfig useful)
 CONFIG_FAST='yes'             # skip startup of w3m on tty1
 CONFIG_FIREWIRE_DEV='no'      # bugfix for kernel >=2.6.11 - create some firewire-devices
 CONFIG_FIX_PASSWD='yes'       # fix unionfs-problem with passwd
 CONFIG_FIX_UNIONFS='yes'      # fix/workaround for unionfs
-CONFIG_USERFSTAB='yes'        # check for username of uid 1000
 CONFIG_FWTIMEOUT='yes'        # set timeout for firmware loading
 CONFIG_GRML2HD='yes'          # check for 'grml2hd' bootoption
 CONFIG_HOMEDIR='yes'          # check for persistent homedir option
 CONFIG_HOSTNAME='yes'         # set hostname to 'grml' on systems running from CD
-CONFIG_HOTPLUG_MAIN='no'      # start hotplug system [should be handled by udev now]
 CONFIG_HOTPLUG_AGENT='no'     # deactivate specific hotplug agent(s) via bootparam
 CONFIG_HOTPLUG_BLACKLIST='no' # check for blacklist bootparam
+CONFIG_HOTPLUG_MAIN='no'      # start hotplug system [should be handled by udev now]
 CONFIG_HWINFO='no'            # run hwinfo for module-detection (requires bootparam 'hwinfo'!)
 CONFIG_INTERACTIVE='yes'      # check for expert-mode as bootparam
 CONFIG_KERNEL='yes'           # display information on running kernel
@@ -104,6 +104,7 @@ CONFIG_SWSPEAK='yes'          # run software synthesizer via speakup
 CONFIG_TESTCD='yes'           # CD checker
 CONFIG_TIME='yes'             # set clock, check for bootparam utc/gmt [only in live-mode]
 CONFIG_TIMEZONE='yes'         # get bootparam 'tz' and set it as /etc/localtime [only in live-mode]
+CONFIG_USERFSTAB='yes'        # check for username of uid 1000
 CONFIG_VMWARE='yes'           # vmware specific stuff (use xorg.conf.vmware)
 CONFIG_WELCOME='yes'          # play welcome sound (audio)
 CONFIG_WONDERSHAPER='yes'     # start wondershaper with options provided via bootparam

diff --git a/autoconfig.functions b/autoconfig.functions
index 527dd80..2209e5f 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -389,12 +389,10 @@ if checkbootparam novmware ; then
    ewarn "Skipping running vmware specific stuff as requested on boot commandline." ; eend 0
 else
    if [ -z "$INSTALLED" ] ; then
-      if ! checkbootparam qemu ; then
-         if vmware-detect ; then
-            if [ -r /etc/X11/xorg.conf.vmware ] ; then
-               einfo "VMware: Copying /etc/X11/xorg.conf.vmware to /etc/X11/xorg.conf"
-               cp /etc/X11/xorg.conf.vmware /etc/X11/xorg.conf ; eend $?
-            fi
+      if ! checkbootparam qemu || vmware-detect || stringinstring "BOOT_IMAGE=vmware " "$CMDLINE" ; then
+         if [ -r /etc/X11/xorg.conf.vmware ] ; then
+            einfo "VMware: 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
@@ -2131,6 +2129,18 @@ fi
 }
 # }}}
 
+# {{{ Support customization
+config_distri(){
+if checkbootparam "distri"; then
+  DISTRI="$(getbootparam 'distri' 2>>$DEBUG)"
+  if [ -r /cdrom/desktop/"$DISTRI".jpg ] ; then
+     [ -n "$BOOTDEBUG" ] && einfo "Debug: bootoption distri found and file /cdrom/desktop/$DISTRI present" && eend 0
+     cp /cdrom/desktop/"$DISTRI".jpg /usr/share/grml/desktop.jpg
+  fi
+fi
+}
+# }}}
+
 ### {{{ backwards compatible stuff
 config_environment(){
   ewarn "config_environment is deprecated. Please set CONFIG_ENVIRONMENT in /etc/grml/autoconfig to 'no'." ; eend 0

diff --git a/autoconfig.small b/autoconfig.small
index 199a937..7877c39 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.
-# Latest change: Son Mär 25 12:45:17 CEST 2007 [mika]
+# Latest change: Mit Apr 04 21:33:42 CEST 2007 [mika]
 ################################################################################
 
 ################################################################################
@@ -58,26 +58,26 @@ CONFIG_BLIND='yes'            # check for blind option or brltty
 CONFIG_CDROM_PERM='yes'       # for burning on IDE-CD-Roms, k3b (and others) check for special permissions
 CONFIG_CDROM_SCRIPTS='yes'    # run scripts from /cdrom/scripts
 CONFIG_CONSOLE='yes'          # activate mgetty when using console=... as bootparam
-CONFIG_DMA='yes'              # Enable DMA for all IDE drives
 CONFIG_CREATE_MNT_DIRS='no'   # create /mnt-directories
 CONFIG_DEBNET='yes'           # search for /etc/network/interfaces on partitions and set up network afterwards
 CONFIG_DEBS='yes'             # check for bootoption debs for installing .debs
 CONFIG_DEBUG='yes'            # activate start of shells during startup at several stages
 CONFIG_DISCOVER='no'          # use discover for hardware detection
 CONFIG_DISTCC='no'            # activate and setup distcc through bootparam distcc=$NETWORK,$INTERFACE
+CONFIG_DISTRI='yes'           # support some customization via bootoption distri
+CONFIG_DMA='yes'              # Enable DMA for all IDE drives
 CONFIG_EXTRACT='yes'          # specify which (only in combination with bootparam myconfig/netconfig useful)
 CONFIG_FAST='yes'             # skip startup of w3m on tty1
 CONFIG_FIREWIRE_DEV='no'      # bugfix for kernel >=2.6.11 - create some firewire-devices
 CONFIG_FIX_PASSWD='yes'       # fix unionfs-problem with passwd
 CONFIG_FIX_UNIONFS='yes'      # fix/workaround for unionfs
-CONFIG_USERFSTAB='yes'        # check for username of uid 1000
 CONFIG_FWTIMEOUT='yes'        # set timeout for firmware loading
 CONFIG_GRML2HD='yes'          # check for 'grml2hd' bootoption
 CONFIG_HOMEDIR='yes'          # check for persistent homedir option
 CONFIG_HOSTNAME='yes'         # set hostname to 'grml' on systems running from CD
-CONFIG_HOTPLUG_MAIN='no'      # start hotplug system [should be handled by udev now]
 CONFIG_HOTPLUG_AGENT='no'     # deactivate specific hotplug agent(s) via bootparam
 CONFIG_HOTPLUG_BLACKLIST='no' # check for blacklist bootparam
+CONFIG_HOTPLUG_MAIN='no'      # start hotplug system [should be handled by udev now]
 CONFIG_HWINFO='no'            # run hwinfo for module-detection (requires bootparam 'hwinfo'!)
 CONFIG_INTERACTIVE='yes'      # check for expert-mode as bootparam
 CONFIG_KERNEL='yes'           # display information on running kernel
@@ -104,6 +104,7 @@ CONFIG_SWSPEAK='no'           # run software synthesizer via speakup
 CONFIG_TESTCD='yes'           # CD checker
 CONFIG_TIME='yes'             # set clock, check for bootparam utc/gmt [only in live-mode]
 CONFIG_TIMEZONE='yes'         # get bootparam 'tz' and set it as /etc/localtime [only in live-mode]
+CONFIG_USERFSTAB='yes'        # check for username of uid 1000
 CONFIG_VMWARE='no'            # vmware specific stuff (use xorg.conf.vmware)
 CONFIG_WELCOME='yes'          # play welcome sound (audio)
 CONFIG_WONDERSHAPER='yes'     # start wondershaper with options provided via bootparam

diff --git a/debian/changelog b/debian/changelog
index c3e84a0..c2062ba 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-autoconfig (0.6.30) unstable; urgency=low
+
+  * config_vmware(): if vmware-detect fails (in grml64 currently
+    for example) additionally check for bootimage vmware.
+  * config_distri(): new code which supports setting wallpaper
+    via /cdrom/desktop/$DISTRI.jpg
+
+ -- Michael Prokop <mika@grml.org>  Wed,  4 Apr 2007 21:28:49 +0200
+
 grml-autoconfig (0.6.29) unstable; urgency=low
 
   * config_language(): rework the way unicode_start and consolechars

diff --git a/grml-autoconfig b/grml-autoconfig
index 5500fde..433a8e0 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.
-# Latest change: Son Mär 25 12:45:38 CEST 2007 [mika]
+# Latest change: Mit Apr 04 21:34:05 CEST 2007 [mika]
 ################################################################################
 
 # http://wiki.debian.org/LSBInitScripts =>
@@ -252,6 +252,8 @@ checkvalue $CONFIG_AUTOMOUNT && config_automount
 
 checkvalue $CONFIG_DISTCC && config_distcc
 
+checkvalue $CONFIG_DISTRI && config_distri
+
 checkvalue $CONFIG_BLANKING && config_blanking
 
 [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||||||">/dev/tty7