[Fai-commit] r6280 - in trunk/examples/simple/scripts: DEBIAN FAIBASE

Michael Goetze mgoetze-guest at alioth.debian.org
Tue Feb 8 17:00:01 UTC 2011


Author: mgoetze-guest
Date: 2011-02-08 16:59:59 +0000 (Tue, 08 Feb 2011)
New Revision: 6280

Removed:
   trunk/examples/simple/scripts/FAIBASE/40-misc
Modified:
   trunk/examples/simple/scripts/DEBIAN/40-misc
   trunk/examples/simple/scripts/FAIBASE/10-misc
Log:
Deduplicate scripts/{DEBIAN,FAIBASE}/40-misc in simple-examples

Modified: trunk/examples/simple/scripts/DEBIAN/40-misc
===================================================================
--- trunk/examples/simple/scripts/DEBIAN/40-misc	2011-02-08 00:04:12 UTC (rev 6279)
+++ trunk/examples/simple/scripts/DEBIAN/40-misc	2011-02-08 16:59:59 UTC (rev 6280)
@@ -2,9 +2,6 @@
 
 error=0 ; trap "error=$((error|1))" ERR
 
-chmod -c 1777 ${target}/tmp
-chown -c 0:0  ${target}/tmp
-
 ainsl -av ${target}/etc/mailname ${HOSTNAME}
 sed -i -e "s/^UTC.*/UTC=${UTC}/" $target/etc/default/rcS
 sed -i -e 's#/sbin/getty 38400#/sbin/getty -f /etc/issue.linuxlogo 38400#' ${target}/etc/inittab

Modified: trunk/examples/simple/scripts/FAIBASE/10-misc
===================================================================
--- trunk/examples/simple/scripts/FAIBASE/10-misc	2011-02-08 00:04:12 UTC (rev 6279)
+++ trunk/examples/simple/scripts/FAIBASE/10-misc	2011-02-08 16:59:59 UTC (rev 6280)
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # (c) Thomas Lange, 2001-2008, lange at debian.org
-# (c) Michael Goetze, 2010, mgoetze at mgoetze.net
+# (c) Michael Goetze, 2010-2011, mgoetze at mgoetze.net
 
 error=0 ; trap "error=$((error|1))" ERR
 
@@ -26,4 +26,7 @@
 # copy default dotfiles for root account
 fcopy -ir /root
 
+chmod -c 1777 ${target}/tmp
+chown -c 0:0  ${target}/tmp
+
 exit $error

Deleted: trunk/examples/simple/scripts/FAIBASE/40-misc
===================================================================
--- trunk/examples/simple/scripts/FAIBASE/40-misc	2011-02-08 00:04:12 UTC (rev 6279)
+++ trunk/examples/simple/scripts/FAIBASE/40-misc	2011-02-08 16:59:59 UTC (rev 6280)
@@ -1,12 +0,0 @@
-#! /bin/bash
-
-error=0 ; trap "error=$((error|1))" ERR
-
-chmod -c 1777 ${target}/tmp
-chown -c 0:0  ${target}/tmp
-
-ainsl -av ${target}/etc/mailname ${HOSTNAME}
-sed -i -e "s/^UTC.*/UTC=${UTC}/" $target/etc/default/rcS
-sed -i -e 's#/sbin/getty 38400#/sbin/getty -f /etc/issue.linuxlogo 38400#' ${target}/etc/inittab
-
-exit $error




More information about the Fai-commit mailing list