Menu
▾
▴
indlinux-cvs
|
From: G K. <kar...@us...> - 2006-01-04 18:37:00
|
Update of /cvsroot/indlinux/livecd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24458 Modified Files: README X11-setup knoppix-autoconfig knoppix-locales makecd.sh testcd.sh Added Files: autoconfig.diff history.txt locales.diff mkxf86.diff mkxf86config morphix-start packages.txt services start.diff xsetup.diff Log Message: update live CD scripts & config files --- NEW FILE: autoconfig.diff --- --- knoppix-autoconfig.old 2006-01-04 18:57:01.000000000 +0530 +++ knoppix-autoconfig 2006-01-04 18:57:59.000000000 +0530 @@ -190,9 +190,12 @@ # Source the locales, which have been placed in a separate file . /etc/init.d/knoppix-locales +DESKTOP="$(getbootparam desktop 2>/dev/null)" +echo "DEBUG: KNX CONFIG - DESKTOP = $DESKTOP" +echo "DEBUG: KNS CONFIG - LANGUAGE = $LANG" # Export it now, so error messages get translated, too -export LANG COUNTRY CHARSET +export LANG COUNTRY CHARSET DESKTOP if test -n "$SPLASH"; then echo "show 8000">/proc/splash 2>/dev/null @@ -607,7 +610,7 @@ if [ -n "$INTERACTIVE" ] then - echo -n "${CYAN}Do you want to (re)configure your graphics (X11) subsystem? (not currently working in Morphix)${NORMAL} [Y/n] " + echo -n "${CYAN}Do you want to (re)configure your graphics (X11) subsystem? (not currently working in Rangoli)${NORMAL} [Y/n] " read a [ "$a" != "n" ] && xf86cfg -textmode -xf86config /etc/X11/XF86Config-4 >/dev/console 2>&1 </dev/console echo " ${GREEN}Interactive configuration finished. Everything else should be fine for now.${NORMAL}" --- NEW FILE: history.txt --- 9 apt-get install gnome-desktop-environment kde 10 apt-get install gnome-desktop-environment kde openoffice.org 11 apt-get install gnome-desktop-environment kde openoffice.org ttf-indic-fonts 12 apt-get install gnome-desktop-environment kde openoffice.org ttf-indic-fonts kde-i18n-hi kde-i18n-ta kde-i18n-pa kde-i18n-bn 13 pwd 14 df 15 apt-get install wvdial 16 apt-get install libwvstreams4.0-base 17 ls 18 apt-get update 19 apt-get upgrade 20 apt-get -f install 21 dpkg -r linux-wlan-ng 22 apt-get -f install 23 pwd 24 du -shc /var/cache/apt/ 25 ps auxw 26 apt-get clean 27 du -shc /var/cache/apt/ 28 cd /usr/share/fonts/ 29 fc-cache -f -v 30 apt-get update 31 apt-get install scim 32 apt-get install scim scim-uim scim-tables-additional scim-m17n 33 apt-get install scim scim-uim scim-tables-additional scim-m17n uim-gtk2.0 uim-xim 34 apt-get install scim scim-uim scim-tables-additional scim-m17n uim-gtk2.0 uim-xim iiimf 35 apt-get install scim scim-uim scim-tables-additional scim-m17n uim-gtk2.0 uim-xim iiimf-sdk 36 apt-get install scim scim-uim scim-tables-additional scim-m17n uim-gtk2.0 uim-xim 37 apt-cache search iiimf 38 apt-get install iiimgcf iiimf-htt-server iiimf-htt-xbe iiimf-htt-le-indic iiimf-htt-csconv 39 pwd 40 ls 41 apt-cache search openoffice.org 42 apt-cache search openoffice.org-l10n 43 apt-cache search hunspell 44 history | wc 45 history > /root/history.txt 46 ls 47 apt-get install hunspell libhunspell-dev openoffice.org-hunspell 48 pwd 49 ls 50 apt-cache search acpi 51 apt-get install acpi-tool 52 apt-get install acpitool 53 apt-get install acpid 54 ls 55 du -shc /var/cache/apt/ 56 scim -d 57 pwd 58 df 59 apt-get clean 60 apt-get install kbabel 61 apt-get install gtranslator 62 apt-get install aspell-hi aspell-gu aspell-bn aspell-pa aspell-ta aspell-or aspell-kn 63 apt-get install aspell-hi aspell-bn aspell-pa aspell-ta aspell-or aspell-kn 64 apt-get install aspell-hi aspell-bn aspell-pa aspell-ta aspell-or 65 apt-cache search aspell- 66 apt-get install aspell-te aspell-en 67 apt-get clean 68 export DISPLAY=192.168.1.177:0.0 69 oowriter 70 oowriter 71 oowriter 72 cd /usr/share/ 73 ls 74 cd openoffice/ 75 ls 76 cd .. 77 cd .. 78 cd lib/openoffice/ 79 ls 80 cd share/ 81 ls 82 cd uno_packages/ 83 ls 84 ls -l 85 ls 86 locate libhunspell 87 updatedb 88 locate libhunspell 89 ls 90 cd tmp 91 ls 92 tar zxvf hi-demo.tar.gz 93 tar zxvf mr-demo.tar.gz 94 tar zxvf pa-demo.tar.gz 95 tar zxvf ta-demo.tar.gz 96 ls 97 tar zxvf or-demo.tar.gz 98 tar zxvf bn-demo.tar.gz 99 ls 100 cp bn/bn.aff bn/bn.dic /usr/lib/openoffice/share/dict/ooo/ 101 cp hi/hi.aff hi/hi.dic /usr/lib/openoffice/share/dict/ooo/ 102 cp or/or.aff or/or.dic /usr/lib/openoffice/share/dict/ooo/ 103 cp pa/pa.aff pa/pa.dic /usr/lib/openoffice/share/dict/ooo/ 104 ls 105 cp mr/mr.aff mr/mr.dic /usr/lib/openoffice/share/dict/ooo/ 106 cp ta/ta.aff ta/ta.dic /usr/lib/openoffice/share/dict/ooo/ 107 ls 108 ls 109 ls 110 cd /usr/lib/openoffice/share/dict/ 111 ls 112 cd ooo 113 ls 114 vi dictionary.lst 115 mv bn.aff bn_IN.aff 116 mv bn.dic bn_IN.dic 117 mv hi.dic hi_IN.dic 118 mv hi.aff hi_IN.aff 119 mv pa.aff pa_IN.aff 120 mv pa.dic pa_IN.dic 121 mv ta.dic ta_IN.dic 122 mv ta.aff ta_IN.aff 123 ls 124 mv mr.aff mr_IN.aff 125 mv mr.dic mr_IN.dic 126 mv or.aff or_IN.aff 127 mv or.dic or_IN.dic 128 ls 129 pwd 130 cd 131 oowriter 132 export DISPLAY=192.168.1.177:0.0 133 oowriter 134 pwd 135 ls 136 ls -l 137 apt-get clean 138 ls 139 pwd 140 ls 141 dpkg -l > packages.txt 142 ls 143 pwd 144 ls 145 ls -l 146 history > history2.txt 147 ls 148 ls 149 cd tmp 150 ls 151 ls -l 152 ls -la 153 cd .. 154 ls -la 155 cd /tmp 156 l 157 ls 158 rm -Rf * 159 ls 160 ls -la 161 pwd 162 cd .. 163 umount /tmp 164 apt-get update 165 apt-cache search cups 166 dpkg -l > /root/packages.txt 167 wc /root/packages.txt 168 ls 169 dpkg -l | grep cups 170 apt-get install cupsys cupsys-bsd cupsys-client 171 pwd 172 ls 173 locate dz 174 pwd 175 ls 176 cd /usr/share/fonts/truetype/ 177 ls 178 cd ttf-devanagari-fonts/ 179 ls 180 rm chandas1-1.ttf 181 ls 182 fc-cache -f -v 183 pwd 184 ls 185 cd .. 186 ls 187 df 188 pwd 189 l 190 ls 191 pwd 192 cd .. 193 ls 194 cd .. 195 ls 196 cd 197 cd / 198 cd morphix/ 199 ls 200 cd init.d/ 201 ls 202 less X11-setup 203 grep gnome * 204 ls 205 cd .. 206 ls 207 pwd 208 df 209 apt-get install xine 210 apt-get install xine-ui 211 du -shc /var/cache/ 212 du -shc /var/cache/apt/ 213 apt-get clean 214 du -shc /var/cache/apt/ 215 du -shc /var/cache/ 216 ls 217 cd /tmp 218 ls 219 ls -la 220 less /etc/init.d/ 221 cd /morphix/ 222 ls 223 vi init.sh 224 cd init.d/ 225 pw 226 pwd 227 ls 228 ls 229 cp console services 230 ls 231 vi services 232 vi services 233 /etc/init.d/cupsys start 234 lpq 235 lpq 236 pwd 237 ls 238 less basemodule 239 ls 240 vi services 241 which scim 242 vi services 243 ls -l 244 cd .. 245 cd rc.m/ 246 ls 247 ls -l 248 ln S06-services ../init.d/services 249 ln ../init.d/services S06-services 250 ls 251 ls -l 252 ln -s ../init.d/services S06-services 253 ls -l 254 rm S06-services 255 ln -s ../init.d/services S06-services 256 ls -l 257 cd .. 258 ls 259 cd .. 260 ls 261 cd etc/skel/ 262 ls 263 cd .gconf/desktop/gnome/peripherals/keyboard/kbd/ 264 ls 265 less %gconf.xml 266 cp %gconf.xml %gconf-hi.xml 267 cp %gconf.xml %gconf-gu.xml 268 cp %gconf.xml %gconf-pa.xml 269 cp %gconf.xml %gconf-te.xml 270 cp %gconf.xml %gconf-ta.xml 271 cp %gconf.xml %gconf-dz.xml 272 cp %gconf.xml %gconf-ml.xml 273 cp %gconf.xml %gconf-or.xml 274 cp %gconf.xml %gconf-bn.xml 275 ls 276 vi %gconf-bn.xml 277 vi %gconf-dz.xml 278 vi %gconf-gu.xml 279 vi %gconf-bn.xml 280 vi %gconf-hi.xml 281 vi %gconf-ml.xml 282 vi %gconf-or.xml 283 vi %gconf-pa.xml 284 vi %gconf-te.xml 285 vi %gconf-ta.xml 286 cp %gconf.xml %gconf-en.xml 287 vi %gconf-en.xml 288 ls 289 ls 290 pwd 291 ls 292 rm %gconf 293 rm %gconf.xml 294 pwd 295 ls 296 cd .. 297 ls 298 cd .. 299 ls 300 cd .. 301 cd .. 302 cd .. 303 cd .. 304 cd .kde 305 cd share/apps/ 306 ls 307 cd .. 308 cd config/ 309 ls 310 cp kxkbrc kxkbrc-hi 311 cp kxkbrc kxkbrc-en 312 cp kxkbrc kxkbrc-pa 313 cp kxkbrc kxkbrc-bn 314 cp kxkbrc kxkbrc-ta 315 vi kxkbrc-en 316 vi kxkbrc-hi 317 vi kxkbrc-ta 318 vi kxkbrc-bn 319 ls 320 ls -l 321 cp kdeglobals kdeglobals-hi 322 ls 323 cd .. 324 ls 325 pwd 326 ls 327 cd config/ 328 ls 329 cp kdeglobals kdeglobals-en 330 vi kdeglobals-en 331 pwd 332 ls 333 cd .. 334 ls 335 cd .. 336 ls 337 cd .. 338 ls 339 pwd 340 cd 341 du -shc /var/tmp/ 342 ls 343 pwd 344 ls 345 cd morphix/ 346 ls 347 ls -l 348 ls 349 pwd 350 cd init.d/ 351 ls 352 vi X11-setup 353 ls 354 cd .. 355 ls 356 cd .. 357 ls 358 pwd 359 cd /etc/skel/ 360 ls 361 cd .kde/share/ 362 ls 363 cd config/ 364 ls 365 ls kdeglobals* 366 cp kdeglobals.hi kdeglobals.ta 367 cp kdeglobals-hi kdeglobals-ta 368 vi kdeglobals-ta 369 vi kxkbrc 370 vi kxkbrc-hi 371 vi kxkbrc-ta 372 ls 373 pwd 374 ls -l *-* 375 cd .. 376 cd .. 377 ls 378 cd .. 379 ls 380 cd .. 381 cd .. 382 ls 383 cd morphix/ 384 ls 385 cd init.d/ 386 ls 387 ls 388 vi X11-setup 389 pwd 390 ls 391 ls 392 cd .. 393 ls /tmp 394 ls -l 395 apt-get update 396 apt-get upgrade 397 export DISPLAY=192.168.1.177:0.0 398 synaptic 399 ls 400 ls 401 cd 402 ls 403 ls -l 404 tar zxvf firefox-1.0.4.en-US.linux-pango-i686.installer.tar.gz 405 cd firefox-installer/ 406 ls 407 ./firefox-installer 408 ls 409 cd .. 410 ls 411 rm -Rf firefox-installer/ 412 rm firefox-1.0.4.en-US.linux-pango-i686.installer.tar.gz 413 ls 414 pwd 415 ls 416 ls 417 cd /opt/firefox-1.0.4/ 418 ls 419 rm libpango* 420 ls 421 rm pango* 422 ls 423 ./firefox 424 ls 425 cd .. 426 rm -Rf firefox-1.0.4/ 427 ls 428 cd /root/ 429 tar zxvf firefox-1.0.4.en-US.linux-pango-i686.installer.tar.gz 430 cd firefox-installer/ 431 ./firefox-installer 432 ls 433 cd /opt/firefox-1.0.4/ 434 ls 435 ./run-mozilla.sh 436 less run-mozilla.sh 437 ./firefox 438 rm libpango* 439 ./firefox 440 pwd 441 ls 442 cd .. 443 rm -Rf firefox-1.0.4/ 444 ls 445 ls -la 446 cd cd 447 cd 448 ls 449 rm -Rf firefox-* 450 ls 451 ls -l 452 pwd 453 du -shc /var/cache/apt/ 454 ls 455 cd /etc/skel/ 456 ls 457 cd 458 ls /tmp 459 rm -Rf /tmp/uimhelper-root 460 rm -Rf /tmp/* 461 ls 462 pwd 463 ls 464 cd .. 465 ls 466 pwd 467 pwd 468 df 469 apt-get install morphixinstaller 470 morphixinstaller 471 l 472 ls /tmp 473 ls 474 cd .. 475 cd var/tmp/ 476 ls 477 ls -l 478 rm -Rf uimhelper-root 479 s 480 cd 481 export DISPLAY=192.168.1.177:0.0 482 gnome-font-properties 483 gnome-font-properties 484 cd /root/ 485 pwd 486 ls 487 pwd 488 ls 489 cd 490 apt-get install morphix-init-gnome 491 dpkg -L morphix-init-gnome 492 dpkg -L morphix-init-kde 493 apt-get install morphix-init-kde 494 pwd 495 ls 496 cd .. 497 pwd 498 du -shc /var/cache/apt/ 499 apt-get clea 500 apt-get clean 501 dpkg -l > /root/packages.txt 502 wc /root/packages.txt 503 ls 504 ls -la 505 cd /root/ 506 ls 507 ls -la 508 history > history.txt --- NEW FILE: locales.diff --- --- knoppix-locales.old 2006-01-04 18:56:49.000000000 +0530 +++ knoppix-locales 2006-01-04 18:57:55.000000000 +0530 @@ -334,7 +334,166 @@ KDEKEYBOARDS="us" TZ="Europe/London" ;; - *) + +hi) +# Hindi + LANGUAGE="hi_IN.UTF-8" + COUNTRY="in" + LANG="hi_IN.UTF-8" + KEYTABLE="us" + XKEYBOARD="us" + KDEKEYBOARD="dev" + CHARSET="UTF-8" + KDEKEYBOARDS="us" + TZ="Asia/Calcutta" + ;; + +bn) +# Bengali + LANGUAGE="bn_IN.UTF-8" + COUNTRY="in" + LANG="bn_IN.UTF-8" + KEYTABLE="us" + XKEYBOARD="us" + KDEKEYBOARD="ben" + CHARSET="UTF-8" + KDEKEYBOARDS="us" + TZ="Asia/Calcutta" + ;; + +gu) +# Gujarati + LANGUAGE="gu_IN.UTF-8" + COUNTRY="in" + LANG="gu_IN.UTF-8" + KEYTABLE="us" + XKEYBOARD="us" + KDEKEYBOARD="guj" + CHARSET="UTF-8" + KDEKEYBOARDS="us" + TZ="Asia/Calcutta" + ;; + +kn) +# Kannada + LANGUAGE="kn_IN.UTF-8" + COUNTRY="in" + LANG="kn_IN.UTF-8" + KEYTABLE="kan" + XKEYBOARD="kan" + KDEKEYBOARD="kan" + CHARSET="UTF-8" + KDEKEYBOARDS="kan,us" + TZ="Asia/Calcutta" + ;; + +mr) +# Marathi + LANGUAGE="mr_IN.UTF-8" + COUNTRY="in" + LANG="mr_IN.UTF-8" + KEYTABLE="us" + XKEYBOARD="us" + KDEKEYBOARD="dev" + CHARSET="UTF-8" + KDEKEYBOARDS="us" + TZ="Asia/Calcutta" + ;; + +ml) +# Malayalam + LANGUAGE="ml_IN.UTF-8" + COUNTRY="in" + LANG="ml_IN.UTF-8" + KEYTABLE="us" + XKEYBOARD="us" + KDEKEYBOARD="ml" + CHARSET="UTF-8" + KDEKEYBOARDS="us" + DESKTOP="GNOME" + TZ="Asia/Calcutta" + ;; + +ne) +# Nepali + LANGUAGE="ne_NP.UTF-8" + COUNTRY="np" + LANG="ne_NP.UTF-8" + KEYTABLE="us" + XKEYBOARD="us" + KDEKEYBOARD="ne" + CHARSET="UTF-8" + KDEKEYBOARDS="us" + DESKTOP="KDE" + TZ="Asia/Calcutta" + ;; + +pa) +# Punjabi + LANGUAGE="pa_IN.UTF-8" + COUNTRY="in" + LANG="pa_IN.UTF-8" + KEYTABLE="us" + XKEYBOARD="us" + KDEKEYBOARD="gur" + CHARSET="UTF-8" + KDEKEYBOARDS="us" + TZ="Asia/Calcutta" + ;; + +or) +# Oriya + LANGUAGE="or_IN.UTF-8" + COUNTRY="in" + LANG="or_IN.UTF-8" + KEYTABLE="us" + XKEYBOARD="us" + KDEKEYBOARD="ori" + CHARSET="UTF-8" + KDEKEYBOARDS="us" + TZ="Asia/Calcutta" + ;; + +ta) +# Tamil + LANGUAGE="ta_IN.UTF-8" + COUNTRY="in" + LANG="ta_IN.UTF-8" + KEYTABLE="us" + XKEYBOARD="us" + KDEKEYBOARD="tam" + CHARSET="UTF-8" + KDEKEYBOARDS="us" + TZ="Asia/Calcutta" + ;; + +te) +# Telugu + LANGUAGE="te_IN.UTF-8" + COUNTRY="in" + LANG="te_IN.UTF-8" + KEYTABLE="us" + XKEYBOARD="tel" + KDEKEYBOARD="tel" + CHARSET="UTF-8" + KDEKEYBOARDS="tel,us" + TZ="Asia/Calcutta" + ;; + +dz) +# Dzongkha + LANGUAGE="dz_BT.UTF-8" + COUNTRY="bt" + LANG="dz_BT.UTF-8" + KEYTABLE="us" + XKEYBOARD="dz" + KDEKEYBOARD="dz" + CHARSET="UTF-8" + KDEKEYBOARDS="dz,us" + TZ="Asia/Thimpu" + ;; + +*) # US version LANGUAGE="us" COUNTRY="us" --- NEW FILE: mkxf86.diff --- --- mkxf86config.old 2006-01-04 21:53:09.000000000 +0530 +++ mkxf86config 2006-01-04 20:19:30.000000000 +0530 @@ -418,6 +418,7 @@ sed -e 's|Identifier[ ]*"Monitor0"|Identifier "Monitor0"\ '"$DPMS"'|g' /etc/X11/XF86Config-4 >/etc/X11/XF86Config-4.new mv -f /etc/X11/XF86Config-4.new /etc/X11/XF86Config-4 +cp /etc/X11/XF86Config-4 /etc/X11/xorg.conf fi fi --- NEW FILE: mkxf86config --- #!/bin/bash # # $Id: mkxf86config,v 1.1 2006/01/04 18:36:42 karunakar Exp $ # PATH="/bin:/usr/bin:/sbin:/usr/sbin"; export PATH umask 022 # [ "`id -u`" != "0" ] && echo "WARNING: $0 has to run as root to work properly." 1>&2 KVER="$(uname -r)" # ANSI COLORS CRE=" [K" NORMAL="[0;39m" # RED: Failure or error message RED="[1;31m" # GREEN: Success message GREEN="[1;32m" # YELLOW: Descriptions YELLOW="[1;33m" # BLUE: System messages BLUE="[1;34m" # MAGENTA: Found devices or drivers MAGENTA="[1;35m" # CYAN: Questions CYAN="[1;36m" # BOLD WHITE: Hint WHITE="[1;37m" TMPFILE="/tmp/mkxf86config-$$" MONITORTMP="$TMPFILE-monitor" rm -f "$TMPFILE" "$MONITORTMP" ### Utility Function(s) # Reread boot command line; echo last parameter's argument or return false. CMDLINE="$(cat /proc/cmdline)" getbootparam(){ case "$CMDLINE" in *\ $1=*) ;; *) return 1; ;; esac result="${CMDLINE##*$1=}" result="${result%%[ ]*}" echo "$result" return 0 } checkbootparam(){ case "$CMDLINE" in *\ $1*) return 0;; esac return 1 } # Read in what hwsetup has found for X [ -f /etc/sysconfig/xserver ] && . /etc/sysconfig/xserver # Xserver, Xmodule, Xscreen, Xvrefresh, if specified by commandline NEWXSERVER="$(getbootparam xserver 2>/dev/null)" [ -z "$XSERVER" -a -z "$NEWXSERVER" ] && NEWXSERVER="XFree86" [ -n "$NEWXSERVER" ] && { XSERVER="$NEWXSERVER" ; echo "XSERVER='$XSERVER'" >> /etc/sysconfig/morphix ; echo "XSERVER='$XSERVER'" >> /etc/sysconfig/xserver; } NEWXMODULE="$(getbootparam xmodule 2>/dev/null)" [ -z "$XMODULE" -a -z "$NEWXMODULE" ] && NEWXMODULE="vesa" [ -n "$NEWXMODULE" ] && { XMODULE="$NEWXMODULE" ; echo "XMODULE='$XMODULE'" >> /etc/sysconfig/morphix ; echo "XMODULE='$XMODULE'" >> /etc/sysconfig/xserver; } XSCREEN="$(getbootparam xscreen 2>/dev/null)" [ -z "$XSCREEN" ] && XSCREEN="$(getbootparam screen 2>/dev/null)" [ -n "$XSCREEN" ] && { echo "XSCREEN='$XSCREEN'" >> /etc/sysconfig/morphix ; echo "XSCREEN='$XSCREEN'" >> /etc/sysconfig/xserver; } XVREFRESH="$(getbootparam xvrefresh 2>/dev/null)" [ -n "$XVREFRESH" ] || XVREFRESH="$(getbootparam vrefresh 2>/dev/null)" [ -n "$XVREFRESH" ] || XVREFRESH="$(getbootparam xvsync 2>/dev/null)" [ -n "$XVREFRESH" ] || XVREFRESH="$(getbootparam vsync 2>/dev/null)" [ -n "$XVREFRESH" ] && { echo "XVREFRESH='$XVREFRESH'" >> /etc/sysconfig/morphix ; echo "XVREFRESH='$XVREFRESH'" >> /etc/sysconfig/xserver; } XHREFRESH="$(getbootparam xhrefresh 2>/dev/null)" [ -n "$XHREFRESH" ] || XHREFRESH="$(getbootparam hrefresh 2>/dev/null)" [ -n "$XHREFRESH" ] || XHREFRESH="$(getbootparam xhsync 2>/dev/null)" [ -n "$XHREFRESH" ] || XHREFRESH="$(getbootparam hsync 2>/dev/null)" [ -n "$XHREFRESH" ] && { echo "XHREFRESH='$XHREFRESH'" >> /etc/sysconfig/morphix ; echo "XHREFRESH='$XHREFRESH'" >> /etc/sysconfig/xserver; } XDEPTH="$(getbootparam xdepth 2>/dev/null)" [ -n "$XDEPTH" ] || XDEPTH="$(getbootparam depth 2>/dev/null)" [ -n "$XDEPTH" ] && { echo "XDEPTH='$XDEPTH'" >> /etc/sysconfig/morphix ; echo "XDEPTH='$XDEPTH'" >> /etc/sysconfig/xserver; } # Wheel WHEEL="" if checkbootparam "wheel"; then WHEEL='s|"PS/2"|"IMPS/2"\ Option "ZAxisMapping" "4 5"|g;' elif checkbootparam "nowheel"; then # Don't change the default, which is plain PS/2 WHEEL="" else # Apparently, the mouse auto-protocol option works in XFree 4.3 now. Let's give it a try. WHEEL='s|"PS/2"|"auto"\ Option "ZAxisMapping" "4 5"|g;' fi # Read in changes [ -f /etc/sysconfig/morphix ] && . /etc/sysconfig/morphix # Read default keyboard from config file. # There seems to be no reliable autoprobe possible. [ -f /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard # Create mouse link and insert a mouse default type into XF86Config # if not already done by hwsetup [ -f /etc/sysconfig/mouse ] && . /etc/sysconfig/mouse [ -e /dev/mouse ] || ln -sf /dev/ttyS0 /dev/mouse # PROTO="${XMOUSETYPE:-Auto}" PROTO="${XMOUSETYPE:-Microsoft}" NOEMU="" [ "${XEMU3}" = "no" ] && NOEMU='s|^.*Emulate3|# No 2 -> 3 Button emulation|g' DEADKEYS="" [ "$XKEYBOARD" = "de" ] || DEADKEYS='s|^.*nodeadkeys.*$||g;' if [ -n "XMODULE" ]; then # Check for Framebuffer X-Modules and initialize framebuffer module case "$XMODULE" in pvr2fb) modprobe "$XMODULE" >/dev/null 2>&1 ; XMODULE="fbdev"; ;; esac fi NODDC="" checkbootparam noddc && NODDC="true" MONITOR="" COMPLETE="" RC="" #try to detect monitor if [ -z "$NODDC" -a -x /usr/bin/get-edid ];then get-edid 2>/dev/null|parse-edid 2>/dev/null >/etc/sysconfig/monitor RC="$?" if [ "$RC" = "0" ];then sed -i -e 's/Identifier[ \t]*".*"/Identifier "Monitor0"/g' /etc/sysconfig/monitor 2>/dev/null MONITOR=`cat /etc/sysconfig/monitor` fi COMPLETE="$(awk '/EndSection/{print}' <<EOF $MONITOR EOF)" fi if [ -z "$NODDC" -a -z "$MONITOR" ]; then # Try to get Monitor data via ddcxinfo-knoppix MONITOR="$(ddcxinfo-knoppix -monitor)" RC="$?" COMPLETE="$(awk '/EndSection/{print}' <<EOF $MONITOR EOF)" fi if [ "$RC" != "0" -o -z "$MONITOR" -o -z "$COMPLETE" ]; then MONITOR=' Section "Monitor" Identifier "Monitor0" ModelName "Old Monitor (no DDC)" # HorizSync 28.0 - 78.0 # Warning: This may fry very old Monitors HorizSync 28.0 - 96.0 # Warning: This may fry old Monitors # VertRefresh 50.0 - 76.0 # Very conservative. May flicker. VertRefresh 50.0 - 60.0 # Extreme conservative. Will flicker. TFT default. # Default modes distilled from # "VESA and Industry Standards and Guide for Computer Display Monitor # Timing", version 1.0, revision 0.8, adopted September 17, 1998. # $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.4 1999/11/18 16:52:17 tsi Exp $ # 640x350 @ 85Hz (VESA) hsync: 37.9kHz ModeLine "640x350" 31.5 640 672 736 832 350 382 385 445 +hsync -vsync # 640x400 @ 85Hz (VESA) hsync: 37.9kHz ModeLine "640x400" 31.5 640 672 736 832 400 401 404 445 -hsync +vsync # 720x400 @ 85Hz (VESA) hsync: 37.9kHz ModeLine "720x400" 35.5 720 756 828 936 400 401 404 446 -hsync +vsync # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync # 640x480 @ 72Hz (VESA) hsync: 37.9kHz ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync # 640x480 @ 75Hz (VESA) hsync: 37.5kHz ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync # 640x480 @ 85Hz (VESA) hsync: 43.3kHz ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync # 800x600 @ 56Hz (VESA) hsync: 35.2kHz ModeLine "800x600" 36.0 800 824 896 1024 600 601 603 625 +hsync +vsync # 800x600 @ 60Hz (VESA) hsync: 37.9kHz ModeLine "800x600" 40.0 800 840 968 1056 600 601 605 628 +hsync +vsync # 800x600 @ 72Hz (VESA) hsync: 48.1kHz ModeLine "800x600" 50.0 800 856 976 1040 600 637 643 666 +hsync +vsync # 800x600 @ 75Hz (VESA) hsync: 46.9kHz ModeLine "800x600" 49.5 800 816 896 1056 600 601 604 625 +hsync +vsync # 800x600 @ 85Hz (VESA) hsync: 53.7kHz ModeLine "800x600" 56.3 800 832 896 1048 600 601 604 631 +hsync +vsync # 1024x768i @ 43Hz (industry standard) hsync: 35.5kHz ModeLine "1024x768" 44.9 1024 1032 1208 1264 768 768 776 817 +hsync +vsync Interlace # 1024x768 @ 60Hz (VESA) hsync: 48.4kHz ModeLine "1024x768" 65.0 1024 1048 1184 1344 768 771 777 806 -hsync -vsync # 1024x768 @ 70Hz (VESA) hsync: 56.5kHz ModeLine "1024x768" 75.0 1024 1048 1184 1328 768 771 777 806 -hsync -vsync # 1024x768 @ 75Hz (VESA) hsync: 60.0kHz ModeLine "1024x768" 78.8 1024 1040 1136 1312 768 769 772 800 +hsync +vsync # 1024x768 @ 85Hz (VESA) hsync: 68.7kHz ModeLine "1024x768" 94.5 1024 1072 1168 1376 768 769 772 808 +hsync +vsync # 1152x864 @ 75Hz (VESA) hsync: 67.5kHz ModeLine "1152x864" 108.0 1152 1216 1344 1600 864 865 868 900 +hsync +vsync # 1280x960 @ 60Hz (VESA) hsync: 60.0kHz ModeLine "1280x960" 108.0 1280 1376 1488 1800 960 961 964 1000 +hsync +vsync # 1280x960 @ 85Hz (VESA) hsync: 85.9kHz ModeLine "1280x960" 148.5 1280 1344 1504 1728 960 961 964 1011 +hsync +vsync # 1280x1024 @ 60Hz (VESA) hsync: 64.0kHz ModeLine "1280x1024" 108.0 1280 1328 1440 1688 1024 1025 1028 1066 +hsync +vsync # 1280x1024 @ 75Hz (VESA) hsync: 80.0kHz ModeLine "1280x1024" 135.0 1280 1296 1440 1688 1024 1025 1028 1066 +hsync +vsync # 1280x1024 @ 85Hz (VESA) hsync: 91.1kHz ModeLine "1280x1024" 157.5 1280 1344 1504 1728 1024 1025 1028 1072 +hsync +vsync # 1600x1200 @ 60Hz (VESA) hsync: 75.0kHz ModeLine "1600x1200" 162.0 1600 1664 1856 2160 1200 1201 1204 1250 +hsync +vsync # 1600x1200 @ 65Hz (VESA) hsync: 81.3kHz ModeLine "1600x1200" 175.5 1600 1664 1856 2160 1200 1201 1204 1250 +hsync +vsync # 1600x1200 @ 70Hz (VESA) hsync: 87.5kHz ModeLine "1600x1200" 189.0 1600 1664 1856 2160 1200 1201 1204 1250 +hsync +vsync # 1600x1200 @ 75Hz (VESA) hsync: 93.8kHz ModeLine "1600x1200" 202.5 1600 1664 1856 2160 1200 1201 1204 1250 +hsync +vsync # 1600x1200 @ 85Hz (VESA) hsync: 106.3kHz ModeLine "1600x1200" 229.5 1600 1664 1856 2160 1200 1201 1204 1250 +hsync +vsync # 1792x1344 @ 60Hz (VESA) hsync: 83.6kHz ModeLine "1792x1344" 204.8 1792 1920 2120 2448 1344 1345 1348 1394 -hsync +vsync # 1792x1344 @ 75Hz (VESA) hsync: 106.3kHz ModeLine "1792x1344" 261.0 1792 1888 2104 2456 1344 1345 1348 1417 -hsync +vsync # 1856x1392 @ 60Hz (VESA) hsync: 86.3kHz ModeLine "1856x1392" 218.3 1856 1952 2176 2528 1392 1393 1396 1439 -hsync +vsync # 1856x1392 @ 75Hz (VESA) hsync: 112.5kHz ModeLine "1856x1392" 288.0 1856 1984 2208 2560 1392 1393 1396 1500 -hsync +vsync # 1920x1440 @ 60Hz (VESA) hsync: 90.0kHz ModeLine "1920x1440" 234.0 1920 2048 2256 2600 1440 1441 1444 1500 -hsync +vsync # 1920x1440 @ 75Hz (VESA) hsync: 112.5kHz ModeLine "1920x1440" 297.0 1920 2064 2288 2640 1440 1441 1444 1500 -hsync +vsync # Additional modelines ModeLine "1800x1440" 230 1800 1896 2088 2392 1440 1441 1444 1490 +HSync +VSync ModeLine "1800x1440" 250 1800 1896 2088 2392 1440 1441 1444 1490 +HSync +VSync # Extended modelines with GTF timings # 640x480 @ 100.00 Hz (GTF) hsync: 50.90 kHz; pclk: 43.16 MHz ModeLine "640x480" 43.16 640 680 744 848 480 481 484 509 -HSync +Vsync # 768x576 @ 60.00 Hz (GTF) hsync: 35.82 kHz; pclk: 34.96 MHz ModeLine "768x576" 34.96 768 792 872 976 576 577 580 597 -HSync +Vsync # 768x576 @ 72.00 Hz (GTF) hsync: 43.27 kHz; pclk: 42.93 MHz ModeLine "768x576" 42.93 768 800 880 992 576 577 580 601 -HSync +Vsync # 768x576 @ 75.00 Hz (GTF) hsync: 45.15 kHz; pclk: 45.51 MHz ModeLine "768x576" 45.51 768 808 888 1008 576 577 580 602 -HSync +Vsync # 768x576 @ 85.00 Hz (GTF) hsync: 51.42 kHz; pclk: 51.84 MHz ModeLine "768x576" 51.84 768 808 888 1008 576 577 580 605 -HSync +Vsync # 768x576 @ 100.00 Hz (GTF) hsync: 61.10 kHz; pclk: 62.57 MHz ModeLine "768x576" 62.57 768 816 896 1024 576 577 580 611 -HSync +Vsync # 800x600 @ 100.00 Hz (GTF) hsync: 63.60 kHz; pclk: 68.18 MHz ModeLine "800x600" 68.18 800 848 936 1072 600 601 604 636 -HSync +Vsync # 1024x768 @ 100.00 Hz (GTF) hsync: 81.40 kHz; pclk: 113.31 MHz ModeLine "1024x768" 113.31 1024 1096 1208 1392 768 769 772 814 -HSync +Vsync # 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz ModeLine "1152x864" 81.62 1152 1216 1336 1520 864 865 868 895 -HSync +Vsync # 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz ModeLine "1152x864" 119.65 1152 1224 1352 1552 864 865 868 907 -HSync +Vsync # 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz ModeLine "1152x864" 143.47 1152 1232 1360 1568 864 865 868 915 -HSync +Vsync # 1280x960 @ 72.00 Hz (GTF) hsync: 72.07 kHz; pclk: 124.54 MHz ModeLine "1280x960" 124.54 1280 1368 1504 1728 960 961 964 1001 -HSync +Vsync # 1280x960 @ 75.00 Hz (GTF) hsync: 75.15 kHz; pclk: 129.86 MHz ModeLine "1280x960" 129.86 1280 1368 1504 1728 960 961 964 1002 -HSync +Vsync # 1280x960 @ 100.00 Hz (GTF) hsync: 101.70 kHz; pclk: 178.99 MHz ModeLine "1280x960" 178.99 1280 1376 1520 1760 960 961 964 1017 -HSync +Vsync # 1280x1024 @ 100.00 Hz (GTF) hsync: 108.50 kHz; pclk: 190.96 MHz ModeLine "1280x1024" 190.96 1280 1376 1520 1760 1024 1025 1028 1085 -HSync +Vsync # 1400x1050 @ 60.00 Hz (GTF) hsync: 65.22 kHz; pclk: 122.61 MHz ModeLine "1400x1050" 122.61 1400 1488 1640 1880 1050 1051 1054 1087 -HSync +Vsync # 1400x1050 @ 72.00 Hz (GTF) hsync: 78.77 kHz; pclk: 149.34 MHz ModeLine "1400x1050" 149.34 1400 1496 1648 1896 1050 1051 1054 1094 -HSync +Vsync # 1400x1050 @ 75.00 Hz (GTF) hsync: 82.20 kHz; pclk: 155.85 MHz ModeLine "1400x1050" 155.85 1400 1496 1648 1896 1050 1051 1054 1096 -HSync +Vsync # 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz ModeLine "1400x1050" 179.26 1400 1504 1656 1912 1050 1051 1054 1103 -HSync +Vsync # 1400x1050 @ 100.00 Hz (GTF) hsync: 111.20 kHz; pclk: 214.39 MHz ModeLine "1400x1050" 214.39 1400 1512 1664 1928 1050 1051 1054 1112 -HSync +Vsync # 1600x1200 @ 100.00 Hz (GTF) hsync: 127.10 kHz; pclk: 280.64 MHz ModeLine "1600x1200" 280.64 1600 1728 1904 2208 1200 1201 1204 1271 -HSync +Vsync EndSection ' fi # Extract values for display MODEL="$(awk '/^[ ]*ModelName/{print;exit}'<<EOF $MONITOR EOF )" MODEL="${MODEL#*\"}" MODEL="${MODEL%\"*}" HREFRESH="$(awk '/^[ ]*HorizSync/{print $2 $3 $4; exit}'<<EOF $MONITOR EOF )" VREFRESH="$(awk '/^[ ]*VertRefresh/{print $2 $3 $4; exit}'<<EOF $MONITOR EOF )" # Build line of allowed modes MODES="" ADDMODE="" # Use commandline modes if specified [ -n "$XSCREEN" ] && ADDMODE="-firstmode $XSCREEN" if [ -z "$XSCREEN" -a -f /etc/sysconfig/monitor ];then XSCREEN=`grep -e "Mode .*\"" /etc/sysconfig/monitor|grep -o -e "\"[0-9x\"]*"|sed -e 's/"//g'` ADDMODE="-firstmode $XSCREEN" fi if [ -z "$NODDC" ]; then MODES="$(ddcxinfo-knoppix -modes $ADDMODE)" fi if [ "$?" != "0" -o -z "$MODES" ]; then MODES="Modes " [ -n "$XSCREEN" ] && MODES="$MODES \"$XSCREEN\"" MODES="$MODES \"1024x768\" \"800x600\" \"640x480\"" fi # Use commandline vertical refresh rate if specified if [ -n "$XVREFRESH" ]; then MONITOR="$(sed 's|VertRefresh[ ].*$|VertRefresh 49.0 - '"$XVREFRESH"'|g;' <<EOF $MONITOR EOF )" fi # Use... [truncated message content] |
