X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=44034e7df8c030965c642cbc52f713999d6b7f43;hp=527dd800150a28ee22fd9ea3a61f4848fd161cfc;hb=04397dce21be5642ea52a49c3c072ce73d290cf1;hpb=330efcb5d2a6f94018f48292932077f2dd1dd4a5

diff --git a/autoconfig.functions b/autoconfig.functions
index 527dd80..44034e7 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Die Apr 03 17:02:59 CEST 2007 [mika]
+# Latest change: Fre Apr 13 12:49:52 CEST 2007 [mika]
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
@@ -273,9 +273,12 @@ config_language(){
  # activate unicode console if running within utf8 environment
  if [ -r /etc/default/locale ] ; then
     if grep -q "LANG=.*UTF" /etc/default/locale ; then
-       einfo "Setting up unicode environment."
-       unicode_start
-       eend $?
+       if checkgrmlsmall && [ -z "$INSTALLED" ] ; then
+	  ewarn "Not runnning unicode_start: grml-small with reduced language support detected." ; eend 0
+       else
+          einfo "Setting up unicode environment."
+          unicode_start ; eend $?
+       fi
     fi
  fi
 
@@ -389,8 +392,8 @@ 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 vmware-detect || stringinstring "BOOT_IMAGE=vmware " "$CMDLINE" ; then
+              if ! checkbootparam qemu ; 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 $?
@@ -2131,6 +2134,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