[Fai-commit] r3855 - in trunk/examples/simple: class scripts/DEMO

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-09-05 12:33:53 +0000 (Tue, 05 Sep 2006)
New Revision: 3855

Modified:
   trunk/examples/simple/class/20-hwdetect.source
   trunk/examples/simple/scripts/DEMO/10-misc
Log:
$videodrv renamed to $VIDEODRIVER


Modified: trunk/examples/simple/class/20-hwdetect.source
===================================================================
--- trunk/examples/simple/class/20-hwdetect.source	2006-09-05 12:24:15 UTC (rev 3854)
+++ trunk/examples/simple/class/20-hwdetect.source	2006-09-05 12:33:53 UTC (rev 3855)
@@ -44,15 +44,15 @@
 echo 6 > /proc/sys/kernel/printk
 
 # try to detect graphics card
-# the variable videodrv may be used to generate the XF86config file
+# the variable VIDEODRIVER may be used to generate the XF86config file
 [ -x "$(which discover)" ] && {
     if discover --version | grep "discover \(version \)*1\." ; then
-	videodrv=$(discover --xdriver video 2> /dev/null)
+	VIDEODRIVER=$(discover --xdriver video 2> /dev/null)
     else
-	videodrv=$(discover --data-path=xfree86/server/device/driver display)
+	VIDEODRIVER=$(discover --data-path=xfree86/server/device/driver display)
     fi
-    [ -n "$videodrv" ] && echo "videodrv=$videodrv" >> $LOGDIR/additional.var
-    echo "Video card detected: $videodrv"
+    [ -n "$VIDEODRIVER" ] && echo "VIDEODRIVER=$VIDEODRIVER" >> $LOGDIR/additional.var
+    echo "Video card detected: $VIDEODRIVER"
 }
 
 set_disk_info  # calculate number of available disks

Modified: trunk/examples/simple/scripts/DEMO/10-misc
===================================================================
--- trunk/examples/simple/scripts/DEMO/10-misc	2006-09-05 12:24:15 UTC (rev 3854)
+++ trunk/examples/simple/scripts/DEMO/10-misc	2006-09-05 12:33:53 UTC (rev 3855)
@@ -5,9 +5,9 @@
 ifclass XFREE && {
     fcopy -M /etc/X11/XF86Config   && rm -f $target/etc/X11/XF86Config-4
     fcopy -M /etc/X11/XF86Config-4 && rm -f $target/etc/X11/XF86Config
-    [ -n "$videodrv" ] || videodrv=vesa
-    grep -q %%VIDEODRV%% $target/etc/X11/XF86Config-4 &&
-    perl -pi.orig -pe "s/%%VIDEODRV%%/$videodrv/" $target/etc/X11/XF86Config-4
+    [ -n "$VIDEODRIVER" ] || VIDEODRIVER=vesa
+    grep -q %%VIDEODRIVER%% $target/etc/X11/XF86Config-4 &&
+    perl -pi.orig -pe "s/%%VIDEODRIVER%%/$VIDEODRIVER/" $target/etc/X11/XF86Config-4
 }
 
 # add a demo user account