Modelines related stuff deleted

Bug fixed


git-svn-id: http://svn.openslx.org/svn/openslx/ld4@186 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 11 insertions, 48 deletions

diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 9859ff54..23d30b8f 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -54,34 +54,7 @@ local Monitor='\tIdentifier "Default"\n
 \tOption\t"CalcAlgorithm"\t"CheckDesktopGeometry"\n
 \tHorizSync\tHS\n
 \tVertRefresh\tVS\n
-\t#UseModes\t"Default"\n
 \tOption\t"DPMS"\t"true"'
-local Modes='\tIdentifier "Default"'
-local Modelines='
-\t## crt modelines (refreshrates should be above 72Hz or enable uncommented lines)\n
-\t#Modeline "640x400"    25.175 640  664  760  800  400  409  411  450\n
-\t#Modeline "640x400"    31.5   640  672 736   832  400  401  404  445\n
-\t#Modeline "640x480"     31.50   640  680  720  864   480  488  491  521\n
-\t#Modeline "640x480"     45.80   640  672  768  864   480  488  494  530\n
-\t#Modeline "800x600"     50.00   800  856  976 1040   600  637  643  666\n
-\t#Modeline "800x600"     69.65   800  864  928 1088   600  604  610  640\n
-\t##Modeline "1024x768"    44.90  1024 1048 1208 1264   768  776  784  817 interlace\n
-\t#Modeline "1024x768"    80.00  1024 1052 1164 1360   768  784  787  823\n
-\t#Modeline "1024x768"    86.00  1024 1040 1152 1360   768  784  787  823\n
-\t#Modeline "1024x768"    98.90  1024 1056 1216 1408   768  782  788  822\n
-\t#Modeline "1024x768"   115.50  1024 1056 1248 1440   768  771  781  802\n
-\t#Modeline "1152x864"    92.00  1152 1208 1368 1474   864  865  875  895\n
-\t#Modeline "1152x864"   110.00  1152 1240 1324 1552   864  864  876  908\n
-\t#Modeline "1280x960"   112.00  1280 1312 1456 1704   960  963  970 1064\n
-\t#Modeline "1280x960"   142.00  1280 1312 1456 1712   960  963  970 1064\n
-\t#Modeline "1280x1024"  145.00  1280 1312 1456 1712  1024 1027 1030 1064\n
-\t#Modeline "1280x1024"  157.50  1280 1344 1504 1728  1024 1025 1028 1072\n
-\t#Modeline "1400x1050"  180.00  1400 1472 1672 1880  1050 1052 1055 1100\n
-\t#Modeline "1600x1200"  202.50  1600 1664 1856 2160  1200 1201 1204 1250\n
-\t## tft modlines (refreshrates of 60Hz schould be ok)\n
-\t#Modeline "lcd1024x768"    67.90  1024 1052 1164 1360   768  784  787  823\n
-\t#Modeline "lcd1280x1024"  108.00  1280 1328 1440 1688  1024 1025 1028 1066\n
-\t#Modeline "lcd1400x1050"  160.00  1400 1472 1672 1880  1050 1052 1055 1100'
 local Device='\tIdentifier\t"StdGraphics"\n
 \tVendorName\t"XDESC"\n
 \tDriver\t\t"XMODULE"'
@@ -116,8 +89,6 @@ systems color depth failed.\n  $msg" nonfatal
   CDP=${DEFAULTCOLORDPT}
 fi
 
-# Gather information about the Monitor capabilities for later use
-screenres > /tmp/screenres
 
 
 if [ -n "$hw_monitor" ] ; then
@@ -126,20 +97,16 @@ if [ -n "$hw_monitor" ] ; then
   VS=${hw_monitor%Hz*}
   [ -z "$VS" ] && VS=${hw_monitor%hz*}
   VS=${VS##* }
-  MR=${hw_monitor##* }
+  SCR_MODES=${hw_monitor##* }
 else
+  # Gather information about the Monitor capabilities 
+  screenres > /tmp/screenres
   VERTSR=`cat /tmp/screenres | sed -n '/Vertical Frequency Range/s/[^0-9]* \([0-9-]*\)/\1/p'`
   HORISR=`cat /tmp/screenres | sed -n '/Horizontal Frequency Range/s/[^0-9]* \([0-9-]*\)/\1/p'`
-  if [ -n "$HORISR" ]; then 
-    HS=$HORISR
-  fi
-  if [ -n "$VERTSR" ]; then
-    VS=$VERTSR
-  fi
-  if [ -n "MR" ]; then
-    # compute max resolution
-    MODES=`cat /tmp/screenres | sed -n '/Recommended Screen Modes:/s/[^"]*\(.*\)/\1/p'`
-  fi
+  HS=$HORISR
+  VS=$VERTSR
+  # compute max resolution
+  SCR_MODES=`cat /tmp/screenres | sed -n '/Recommended Screen Modes:/s/[^"]*\(.*\)/\1/p'`
 #  # gather monitor information automatically
 #  ddcprobe > /tmp/ddcprobe
 #  hwmsg="Please check the output of ddcprobe. The settings where not \
@@ -159,9 +126,9 @@ vertical frequency could not be detected. Using default frequency \
 range (${VSYNCRANGE})" nonfatal
   VS=${VSYNCRANGE}
 fi
-if [ -z "$MR" ] ; then error "  $hwmsg resolution was attempted but not \
+if [ -z "$SCR_MODES" ] ; then error "  $hwmsg resolution was attempted but not \
 established. Using default resolutions (${DEFAULTMODES})" nonfatal
-  MR=${DEFAULTMODES}
+  SCR_MODES=${DEFAULTMODES}
 fi
 monmanual=yes 
 
@@ -172,7 +139,7 @@ Dirk von Suchodoletz <dirk@goe.net>, $date" >$xfc
 echo -e "# DO NOT EDIT THIS FILE BUT '$0' INSTEAD!\n#" \
   >>$xfc
 for section in Files ServerFlags Module InputDevice Monitor \
-    Modes Screen Device ServerLayout DRI ; do
+    Screen Device ServerLayout DRI ; do
   echo "Section \"$section\"" >>$xfc
   case "$section" in
     Files)
@@ -236,15 +203,11 @@ pci/agp bus needed for acceleration." ; }
       # synaptics_drv.o
       echo -e $InputMouseDef >>$xfc
     ;;
-    Modes)
-      echo -e ${Modes} >>$xfc
-      echo -e ${Modelines} >>$xfc
-    ;;
     Screen)
       echo -e ${Screen} | sed -e "s,CDP,${CDP}," >>$xfc
       for BPP in 15 16 24 32
         do echo -e '\tSubSection "Display"\n\t\tDepth\t'\
-          $BPP'\n\t\tModes\t'$MODES'\n\tEndSubSection' >>$xfc
+          $BPP'\n\t\tModes\t'$SCR_MODES'\n\tEndSubSection' >>$xfc
         [ $BPP = "$CDP" ] && break
       done
     ;;