Menu
▾
▴
morphix-cvs
|
From: <ale...@us...> - 2004-01-04 23:22:59
|
Update of /cvsroot/morphix/scripts-base/usr/sbin
In directory sc8-pr-cvs1:/tmp/cvs-serv12663
Modified Files:
mkxf86config
Log Message:
0.4-1b changes
Index: mkxf86config
===================================================================
RCS file: /cvsroot/morphix/scripts-base/usr/sbin/mkxf86config,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mkxf86config 12 May 2003 22:54:01 -0000 1.2
--- mkxf86config 4 Jan 2004 23:22:55 -0000 1.3
***************
*** 60,70 ****
[ -n "$XSCREEN" ] && { echo "XSCREEN='$XSCREEN'" >> /etc/sysconfig/knoppix ; echo "XSCREEN='$XSCREEN'" >> /etc/sysconfig/xserver; }
XVREFRESH="$(getbootparam xvrefresh 2>/dev/null)"
- # Added for Hrefresh rates
- [ -n "$YVREFRESH" ] || YVREFRESH="$(getbootparam hrefresh 2> /dev/null)"
- [ -n "$YVREFRESH" ] || YVREFRESH="$(getbootparam hsync 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/knoppix ; echo "XVREFRESH='$XVREFRESH'" >> /etc/sysconfig/xserver; }
XDEPTH="$(getbootparam xdepth 2>/dev/null)"
[ -n "$XDEPTH" ] || XDEPTH="$(getbootparam depth 2>/dev/null)"
--- 60,72 ----
[ -n "$XSCREEN" ] && { echo "XSCREEN='$XSCREEN'" >> /etc/sysconfig/knoppix ; 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/knoppix ; 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/knoppix ; echo "XHREFRESH='$XHREFRESH'" >> /etc/sysconfig/xserver; }
XDEPTH="$(getbootparam xdepth 2>/dev/null)"
[ -n "$XDEPTH" ] || XDEPTH="$(getbootparam depth 2>/dev/null)"
***************
*** 72,87 ****
# Wheel
WHEEL=""
- #checkbootparam "wheel" && WHEEL='s|"PS/2"|"IMPS/2"\
- #Option "ZAxisMapping" "4 5"|g;'
-
if checkbootparam "wheel"; then
WHEEL='s|"PS/2"|"IMPS/2"\
Option "ZAxisMapping" "4 5"|g;'
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/knoppix ] && . /etc/sysconfig/knoppix
--- 74,107 ----
# 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
+ NVGLCORE=""
+ NVDRI=""
+ # Force Nvidia to be used
+ if checkbootparam "nonvidia"; then
+ echo "Skipping Proprietary nvidiadrivers"
+ # Dont use prop nvidia!
+ else
+
+ if [ "$XMODULE" = "nvidia" -o "$XMODULE" = "nv" ]; then
+ NONPROP=`echo "$XDESC" | grep "TNT"`
+ if [ -z $NONPROP ]; then
+ NVGLCORE='s|^.*Load.*"GLcore".*$|#Load "GLcore"|g;'
+ NVDRI='s|^.*Load.*"dri".*$|#Load "dri"|g;'
+ XMODULE="nvidia"
+ fi
+ fi
+ fi
+
# Read in changes
[ -f /etc/sysconfig/knoppix ] && . /etc/sysconfig/knoppix
***************
*** 108,119 ****
fi
- NVGLCORE=""
- NVDRI=""
- if [ "$XMODULE" = "nvidia" -o "$XMODULE" = "nv" ]; then
- NVGLCORE='s|^.*Load.*"GLcore".*$|#Load "GLcore"|g;'
- NVDRI='s|^.*Load.*"dri".*$|#Load "dri"|g;'
- XMODULE="nvidia"
- fi
-
NODDC=""
checkbootparam noddc && NODDC="true"
--- 128,131 ----
***************
*** 139,165 ****
# 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.
! # These are some Modelines that happen to work on many systems
! # Especially the "1024x768" has been thoroughly tested, even on Laptops
! Modeline "640x480" 25.175 640 664 760 800 480 491 493 525 #60Hz
! Modeline "800x600" 40.12 800 848 968 1056 600 601 605 628 #60Hz
! Modeline "1024x768" 85 1024 1056 1152 1360 768 784 787 823
! Modeline "1152x864" 92 1152 1208 1368 1474 864 865 875 895
! Modeline "1152x864" 110 1152 1240 1324 1552 864 864 876 908
! Modeline "1152x864" 135 1152 1464 1592 1776 864 864 876 908
! Modeline "1152x864" 137.65 1152 1184 1312 1536 864 866 885 902 -HSync -VSync
! Modeline "1280x1024" 80 1280 1296 1512 1568 1024 1025 1037 1165 Interlace
! Modeline "1280x1024" 110 1280 1328 1512 1712 1024 1025 1028 1054
! Modeline "1280x1024" 126.5 1280 1312 1472 1696 1024 1032 1040 1068 -HSync -VSync
! Modeline "1280x1024" 135 1280 1312 1456 1712 1024 1027 1030 1064
! Modeline "1280x1024" 135 1280 1312 1416 1664 1024 1027 1030 1064
! Modeline "1280x1024" 157.5 1280 1344 1504 1728 1024 1025 1028 1072 +HSync +VSync
! Modeline "1280x1024" 181.75 1280 1312 1440 1696 1024 1031 1046 1072 -HSync -VSync
! Modeline "1600x1200" 162 1600 1664 1856 2160 1200 1201 1204 1250 +HSync +VSync
! Modeline "1600x1200" 189 1600 1664 1856 2160 1200 1201 1204 1250 -HSync -VSync
! Modeline "1600x1200" 202.5 1600 1664 1856 2160 1200 1201 1204 1250 +HSync +VSync
! Modeline "1600x1200" 220 1600 1616 1808 2080 1200 1204 1207 1244 +HSync +VSync
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
EndSection
'
--- 151,275 ----
# 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
'
***************
*** 207,213 ****
fi
! # Use commandline horizontal syncrate if specified
! if [ -n "$YVREFRESH" ]; then
! MONITOR="$(sed 's|HorizSync[ ].*$|HorizSync 28.0 - '"$YVREFRESH"'|g;' <<EOF
$MONITOR
EOF
--- 317,323 ----
fi
! # Use commandline horizontal refresh rate if specified
! if [ -n "$XHREFRESH" ]; then
! MONITOR="$(sed 's|HorizSync[ ].*$|HorizSync 28.0 - '"$XHREFRESH"'|g;' <<EOF
$MONITOR
EOF
***************
*** 283,287 ****
-e 's|@@MONITOR@@||g' \
-e 's|@@NOPM@@|'"$NOPM"'|g' \
! -e 's|@@XMODULE@@|'"$XMODULE"'|g;'"$VMWARE""$SERIALMOUSE""$USBMOUSE""$PSMOUSE""$SWCURSOR""$WHEEL""$NVGLCORE""$NVDRI" \
-e 's|@@MODES@@|'"$MODES"'|g;'"$DEPTH" \
-e 's|"XkbLayout" *"[^"]*"|"XkbLayout" "'"$XKEYBOARD"'"|g;'"$DEADKEYS" \
--- 393,397 ----
-e 's|@@MONITOR@@||g' \
-e 's|@@NOPM@@|'"$NOPM"'|g' \
! -e 's|@@XMODULE@@|'"$XMODULE"'|g;'"$VMWARE""$SERIALMOUSE""$USBMOUSE""$PSMOUSE""$SWCURSOR""$WHEEL""$NVGLCORE""$NVDRI" \
-e 's|@@MODES@@|'"$MODES"'|g;'"$DEPTH" \
-e 's|"XkbLayout" *"[^"]*"|"XkbLayout" "'"$XKEYBOARD"'"|g;'"$DEADKEYS" \
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X