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

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

Author: lange
Date: 2006-09-19 10:34:09 +0000 (Tue, 19 Sep 2006)
New Revision: 3979

Added:
   trunk/examples/simple/package_config/XORG
Removed:
   trunk/examples/simple/package_config/XFREE
Modified:
   trunk/examples/simple/class/50-host-classes
   trunk/examples/simple/package_config/DEMO
   trunk/examples/simple/scripts/DEMO/10-misc
Log:
rename class XFREE to XORG


Modified: trunk/examples/simple/class/50-host-classes
===================================================================
--- trunk/examples/simple/class/50-host-classes	2006-09-19 08:06:36 UTC (rev 3978)
+++ trunk/examples/simple/class/50-host-classes	2006-09-19 10:34:09 UTC (rev 3979)
@@ -9,7 +9,7 @@
     demohost)
 	echo "FAIBASE DHCPC DEMO" ;;
     gnomehost)
-	echo "FAIBASE DHCPC DEMO XFREE GNOME";;
+	echo "FAIBASE DHCPC DEMO XORG GNOME";;
     atom*)
 	echo "FAIBASE DHCPC DEMO" ;;
     *)

Modified: trunk/examples/simple/package_config/DEMO
===================================================================
--- trunk/examples/simple/package_config/DEMO	2006-09-19 08:06:36 UTC (rev 3978)
+++ trunk/examples/simple/package_config/DEMO	2006-09-19 10:34:09 UTC (rev 3979)
@@ -5,6 +5,6 @@
 rstat-client rstatd
 rusers rusersd
 
-# only when also class XFREE is defined
-PACKAGES aptitude XFREE
+# only when also class XORG is defined
+PACKAGES aptitude XORG
 bb frozen-bubble xpenguins

Deleted: trunk/examples/simple/package_config/XFREE
===================================================================
--- trunk/examples/simple/package_config/XFREE	2006-09-19 08:06:36 UTC (rev 3978)
+++ trunk/examples/simple/package_config/XFREE	2006-09-19 10:34:09 UTC (rev 3979)
@@ -1,6 +0,0 @@
-PACKAGES aptitude
-x-window-system
-xlockmore-gl
-ttf-freefont type1inst
-xscreensaver-nognome
-xscreensaver-gl

Copied: trunk/examples/simple/package_config/XORG (from rev 3978, trunk/examples/simple/package_config/XFREE)
===================================================================
--- trunk/examples/simple/package_config/XORG	                        (rev 0)
+++ trunk/examples/simple/package_config/XORG	2006-09-19 10:34:09 UTC (rev 3979)
@@ -0,0 +1,6 @@
+PACKAGES aptitude
+x-window-system
+xlockmore-gl
+ttf-freefont type1inst
+xscreensaver-nognome
+xscreensaver-gl

Modified: trunk/examples/simple/scripts/DEMO/10-misc
===================================================================
--- trunk/examples/simple/scripts/DEMO/10-misc	2006-09-19 08:06:36 UTC (rev 3978)
+++ trunk/examples/simple/scripts/DEMO/10-misc	2006-09-19 10:34:09 UTC (rev 3979)
@@ -1,13 +1,12 @@
 #! /bin/sh
 
-# (c) Thomas Lange, 2001-2005, lange at debian.org
+# (c) Thomas Lange, 2001-2006, lange at debian.org
 
-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 "$VIDEODRIVER" ] || VIDEODRIVER=vesa
-    grep -q %%VIDEODRIVER%% $target/etc/X11/XF86Config-4 &&
-    perl -pi.orig -pe "s/%%VIDEODRIVER%%/$VIDEODRIVER/" $target/etc/X11/XF86Config-4
+ifclass XORG && {
+    fcopy -M /etc/X11/xorg.conf
+#    [ -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