--- knoppix-autoconfig.orig	2006-05-10 18:12:25.000000000 +0200
+++ knoppix-autoconfig	2006-05-10 18:11:32.000000000 +0200
@@ -131,7 +131,7 @@
 # This should work, but doesn't with Kernel 2.4.19-rc1
 # CMDLINE="$(</proc/cmdline)" This should work, but doesn't with Kernel 2.4.19-rc1
 # This works.
-CMDLINE="$(cat /proc/cmdline)"
+CMDLINE=" $(cat /proc/cmdline) "
 
 
 # Check if we are in interactive startup mode
@@ -298,7 +298,7 @@
 KDEKEYBOARD="fr"
 CHARSET="iso8859-15"
 # Additional KDE Keyboards
-KDEKEYBOARDS="de,us"
+KDEKEYBOARDS="dvorak,us"
 TZ="Europe/Paris"
 ;;
 he|il)
@@ -466,7 +466,7 @@
 KDEKEYBOARD="us"
 CHARSET="iso8859-1"
 # Additional KDE Keyboards
-KDEKEYBOARDS="de,fr"
+KDEKEYBOARDS="dvorak,fr"
 TZ="America/New_York"
 ;;
 esac
@@ -486,6 +486,12 @@
 KDEKEYBOARD="$KKEYBOARD"
 fi
 
+KXKEYBOARDS="$(getbootparam xkeyboards 2>/dev/null)"
+if [ -n "$KXKEYBOARDS" ]; then
+  KDEKEYBOARDS="$KXKEYBOARDS"
+fi
+
+
 # Also read desired desktop, if any
 DESKTOP="$(getbootparam desktop 2>/dev/null)"
 
@@ -557,6 +563,7 @@
 rm -f /dev/cdrom* /dev/cdwriter* /dev/mouse* /dev/modem* /dev/scanner* \
       /etc/sysconfig/i18n /etc/sysconfig/keyboard /etc/sysconfig/knoppix \
       /etc/environment \
+      /dev/dvd \
       2>/dev/null
 fi
 
@@ -814,6 +821,20 @@
 $(cat /proc/sys/dev/cdrom/info 2>/dev/null)
 EOT
 
+# /dev/dvd symlink
+if ! [ -e "/dev/dvd" ]; then
+  for d in $(cd /proc/ide 2>/dev/null && echo hd[a-z]); do
+    if test -d /proc/ide/$d; then
+      MODEL="$(cat /proc/ide/$d/model 2>/dev/null)"
+      case "$MODEL" in *DVD*)
+        ln -sf "/dev/$d" /dev/dvd
+        break ;;
+      esac
+    fi
+  done
+  [ -e "/dev/dvd" ] || ln -sf /dev/cdrom /dev/dvd
+fi
+
 update_progress 60
 
 # Read in what hwsetup has found