[Fai-commit] r5507 - people/michael/experimental/patches
Michael Tautschnig
mt at alioth.debian.org
Wed Sep 9 12:51:03 UTC 2009
Author: mt
Date: 2009-09-09 12:51:03 +0000 (Wed, 09 Sep 2009)
New Revision: 5507
Modified:
people/michael/experimental/patches/bugfix-479537
people/michael/experimental/patches/bugfix-481871
people/michael/experimental/patches/logtail
Log:
Updated experimental patches to work with current trunk
Modified: people/michael/experimental/patches/bugfix-479537
===================================================================
--- people/michael/experimental/patches/bugfix-479537 2009-08-28 04:10:27 UTC (rev 5506)
+++ people/michael/experimental/patches/bugfix-479537 2009-09-09 12:51:03 UTC (rev 5507)
@@ -9,7 +9,7 @@
--- trunk.orig/debian/NEWS
+++ trunk/debian/NEWS
@@ -1,3 +1,11 @@
-+fai (3.2.18+experimental6) unstable; urgency=low
++fai (3.2.XXX+experimentalX) unstable; urgency=low
+
+ - Changed semantics of class lists in PACKAGES (install|aptitude|...) to
+ Boolean AND and added support for negation (using !), see also
@@ -17,9 +17,9 @@
+
+ -- Thomas Lange <lange at debian.org> Fri, 20 Mar 2009 18:25:17 +0100
+
- fai (3.2.8) unstable; urgency=low
+ fai (3.2.XXX) unstable; urgency=low
- - new partition tool setup-storage added
+ - variable FAI_CONFIGDIR moved from fai.conf to make-fai-nfsroot.conf
Index: trunk/bin/install_packages
===================================================================
--- trunk.orig/bin/install_packages
Modified: people/michael/experimental/patches/bugfix-481871
===================================================================
--- people/michael/experimental/patches/bugfix-481871 2009-08-28 04:10:27 UTC (rev 5506)
+++ people/michael/experimental/patches/bugfix-481871 2009-09-09 12:51:03 UTC (rev 5507)
@@ -21,37 +21,6 @@
# if class NOMBR is defined, write boot loader into root partition, not into mbr
ifclass NOMBR && BOOT_DEVICE=$BOOT_PARTITION
-Index: trunk/examples/simple/class/20-hwdetect.source
-===================================================================
---- trunk.orig/examples/simple/class/20-hwdetect.source
-+++ trunk/examples/simple/class/20-hwdetect.source
-@@ -5,7 +5,8 @@
- # NOTE: Files named *.source will be evaluated, but their output ignored. Instead
- # the contents of $newclasses will be added to the list of defined classes.
-
--[ "$action" = "dirinstall" ] && return 0 # Do not execute when doing dirinstall
-+# Do not execute when doing dirinstall or softupdate
-+[ "$action" = "dirinstall" -o "$action" = "softupdate" ] && return 0
-
- echo 0 > /proc/sys/kernel/printk
-
-Index: trunk/examples/simple/scripts/DEMO/10-misc
-===================================================================
---- trunk.orig/examples/simple/scripts/DEMO/10-misc
-+++ trunk/examples/simple/scripts/DEMO/10-misc
-@@ -9,6 +9,9 @@
- # perl -pi.orig -pe "s/%%VIDEODRIVER%%/$VIDEODRIVER/" $target/etc/X11/xorg.conf
- }
-
--# add a demo user account
--$ROOTCMD adduser --disabled-login --gecos "fai demo user" demo
--echo "demo:$ROOTPW" | $ROOTCMD chpasswd --encrypted
-+if ! $ROOTCMD getent passwd demo ; then
-+ # add a demo user account
-+ $ROOTCMD adduser --disabled-login --gecos "fai demo user" demo
-+ echo "demo:$ROOTPW" | $ROOTCMD chpasswd --encrypted
-+fi
-+
Index: trunk/examples/simple/scripts/FAIBASE/30-interface
===================================================================
--- trunk.orig/examples/simple/scripts/FAIBASE/30-interface
@@ -78,32 +47,6 @@
fcopy -iM /etc/network/interfaces /etc/networks
exit $error
-Index: trunk/examples/simple/scripts/FAISERVER/10-conffiles
-===================================================================
---- trunk.orig/examples/simple/scripts/FAISERVER/10-conffiles
-+++ trunk/examples/simple/scripts/FAISERVER/10-conffiles
-@@ -5,10 +5,16 @@
-
- #/etc/fai/fai.conf /etc/fai/make-fai-nfsroot.conf
- fcopy /etc/apt-proxy/apt-proxy-v2.conf /etc/fai/apt/sources.list
--# use the same sources.list for the server itself and the clients
--cp -a $target/etc/fai/apt $target/etc/
-
--rm -f $target/etc/resolv.conf
-+# Michael T: actually I absolutely don't understand the following, but I guess
-+# it must not happen on softupdates
-+if [ $FAI_ACTION != "softupdate" ] ; then
-+ # use the same sources.list for the server itself and the clients
-+ cp -a $target/etc/fai/apt $target/etc/
-+
-+ rm -f $target/etc/resolv.conf
-+
-+ # create some host entries
-+ perl -e 'for (1..25) {printf "192.168.1.%s atom%02s\n",$_,$_;}' >> $target/etc/hosts
-+fi
-
--# create some host entries
--perl -e 'for (1..25) {printf "192.168.1.%s atom%02s\n",$_,$_;}' >> $target/etc/hosts
Index: trunk/examples/simple/scripts/GRUB/10-setup
===================================================================
--- trunk.orig/examples/simple/scripts/GRUB/10-setup
@@ -117,16 +60,3 @@
exit $error
-Index: trunk/examples/simple/scripts/LAST/50-misc
-===================================================================
---- trunk.orig/examples/simple/scripts/LAST/50-misc
-+++ trunk/examples/simple/scripts/LAST/50-misc
-@@ -11,7 +11,7 @@
- done
-
- [ "$FAI_DEBMIRROR" ] &&
--echo "#$FAI_DEBMIRROR $MNTPOINT nfs ro 0 0" >> $target/etc/fstab
-+ainsl $target/etc/fstab "#$FAI_DEBMIRROR $MNTPOINT nfs ro 0 0"
-
- # set bios clock
- if [ $do_init_tasks -eq 1 ] ; then
Modified: people/michael/experimental/patches/logtail
===================================================================
--- people/michael/experimental/patches/logtail 2009-08-28 04:10:27 UTC (rev 5506)
+++ people/michael/experimental/patches/logtail 2009-09-09 12:51:03 UTC (rev 5507)
@@ -6,7 +6,7 @@
===================================================================
--- trunk.orig/bin/fai
+++ trunk/bin/fai
-@@ -280,6 +280,9 @@
+@@ -283,6 +283,9 @@
mkdir -p $LOGDIR
ln -snf $action-$fai_rundate $LOGDIR/../last-$action
ln -snf $action-$fai_rundate $LOGDIR/../last
@@ -46,7 +46,7 @@
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
wait_for_jobs() {
-@@ -419,6 +423,7 @@
+@@ -428,6 +432,7 @@
mkdir -p $FAI_ROOT/var/lib/fai
mkdir -p $FAI_ROOT/var/log/fai
More information about the Fai-commit
mailing list