[Fai-commit] r5856 - in trunk: debian examples/simple/scripts/DEMO

[Thomas Lange]

Author: lange
Date: 2010-07-09 21:08:02 +0000 (Fri, 09 Jul 2010)
New Revision: 5856

Removed:
   trunk/examples/simple/scripts/DEMO/30-demo
Modified:
   trunk/debian/changelog
   trunk/examples/simple/scripts/DEMO/10-misc
Log:
30-demo: replace script with shell code in 10-misc

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-09 21:05:14 UTC (rev 5855)
+++ trunk/debian/changelog	2010-07-09 21:08:02 UTC (rev 5856)
@@ -38,6 +38,7 @@
   * NEWS: add info about setup_harddisks removal
   * fai-mirror, control: replace apt-move by reprepro
   * 99-discover-bug: remove unused script
+  * 30-demo: replace script with shell code in 10-misc
 
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks

Modified: trunk/examples/simple/scripts/DEMO/10-misc
===================================================================
--- trunk/examples/simple/scripts/DEMO/10-misc	2010-07-09 21:05:14 UTC (rev 5855)
+++ trunk/examples/simple/scripts/DEMO/10-misc	2010-07-09 21:08:02 UTC (rev 5856)
@@ -1,17 +1,17 @@
 #! /bin/bash
 
-# (c) Thomas Lange, 2001-2009, lange at debian.org
+# (c) Thomas Lange, 2001-2010, lange at debian.org
 
 ifclass XORG && {
     fcopy -M /etc/X11/xorg.conf
-#    [ -n "$VIDEODRIVER" ] || VIDEODRIVER=vesa
-#    grep -q %%VIDEODRIVER%% $target/etc/X11/xorg.conf &&
-#    perl -pi.orig -pe "s/%%VIDEODRIVER%%/$VIDEODRIVER/" $target/etc/X11/xorg.conf
 }
 
 # add a demo user account
 if ! $ROOTCMD getent passwd demo ; then
     $ROOTCMD adduser --disabled-login --gecos "fai demo user" demo
-#    echo "demo:$ROOTPW" | $ROOTCMD chpasswd --encrypted
+    # echo "demo:$ROOTPW" | $ROOTCMD chpasswd --encrypted
     $ROOTCMD usermod -p "$ROOTPW" demo
 fi
+
+chmod -c 666 ${target}/dev/fd*
+chmod -c 444 ${target}/dev/sr*

Deleted: trunk/examples/simple/scripts/DEMO/30-demo
===================================================================
--- trunk/examples/simple/scripts/DEMO/30-demo	2010-07-09 21:05:14 UTC (rev 5855)
+++ trunk/examples/simple/scripts/DEMO/30-demo	2010-07-09 21:08:02 UTC (rev 5856)
@@ -1,20 +0,0 @@
-#! /usr/sbin/cfagent -f
-
-control:
-   any::
-   actionsequence = ( files editfiles )
-   EditFileSize = ( 30000 )
-
-files:
-   any::
-
-# floppy and cdroms are accessible for all
-        ${target}/dev include=fd* mode=666   action=fixall r=1
-        ${target}/dev include=sr* mode=444   action=fixall r=1
-
-editfiles:
-   any::
-
-	{ ${target}/etc/init.d/sysklogd
-	  ReplaceAll "^SYSLOGD=.*" With 'SYSLOGD="-m 360"'
-	}