[Fai-commit] r5356 - people/michael/experimental/patches
Michael Tautschnig
mt at alioth.debian.org
Sat Apr 18 07:51:07 UTC 2009
Author: mt
Date: 2009-04-18 07:51:07 +0000 (Sat, 18 Apr 2009)
New Revision: 5356
Removed:
people/michael/experimental/patches/bugfix-456978
people/michael/experimental/patches/bugfix-495535
Modified:
people/michael/experimental/patches/bugfix-524347
people/michael/experimental/patches/grub-pc
people/michael/experimental/patches/logtail
people/michael/experimental/patches/series
Log:
dropped patches for bugs already fixed in current trunk, refreshed others
Deleted: people/michael/experimental/patches/bugfix-456978
===================================================================
--- people/michael/experimental/patches/bugfix-456978 2009-04-17 16:33:09 UTC (rev 5355)
+++ people/michael/experimental/patches/bugfix-456978 2009-04-18 07:51:07 UTC (rev 5356)
@@ -1,57 +0,0 @@
-2009-02-13 Michael Tautschnig <mt at debian.org>
-
- * bin/fai: Added -u|--hostname to usage info and enabled use of -u|--hostname
- in all cases where $do_init_tasks != 1 (closes: #456978)
-Index: trunk/bin/fai
-===================================================================
---- trunk.orig/bin/fai
-+++ trunk/bin/fai
-@@ -119,11 +119,12 @@
- Usage: $0 [options] [action]
-
- Options:
-- -v|--verbose display more information during the update
-- -h|--help display this help message
-- -N|--new renew list of classes
-- -c|--class comma separated list of classes
-- -C|--cfdir CFDIR Use CFDIR for reading the config files
-+ -v|--verbose display more information during the update
-+ -h|--help display this help message
-+ -N|--new renew list of classes
-+ -c|--class comma separated list of classes
-+ -C|--cfdir CFDIR use CFDIR for reading the config files
-+ -u|--hostname HNAME set hostname to be used
-
- EOF
- exit 0
-@@ -266,15 +267,12 @@
- [ -f /proc/version ] || mount -n -t proc proc /proc # ubuntu initrd does not mount /proc
- export start_seconds=$(cut -d . -f 1 /proc/uptime)
-
--if [ X$action = Xdirinstall -a -n "$newhostname" ]; then
-- export HOSTNAME=$newhostname
--fi
--
- if [ $do_init_tasks -eq 1 ]; then
- # we are running an initial installation
- export LOGDIR=/tmp/fai
- mkdir -p $LOGDIR
- else
-+ [ -n "$newhostname" ] && export HOSTNAME=$newhostname
- export fai_rundate=$(date +'%Y%m%d_%H%M%S')
- export LOGDIR=/var/log/fai/$HOSTNAME/$action-$fai_rundate
- mkdir -p $LOGDIR
-@@ -289,9 +287,12 @@
- chmod 0750 $LOGDIR
-
- fai_init
--if [ X$action = Xdirinstall ]; then
-+if [ $do_init_tasks -ne 1 ]; then
- [ -n "$newhostname" ] && echo "Hostname set to $HOSTNAME" | tee -a $LOGDIR/fai.log
- unset newhostname
-+fi
-+
-+if [ X$action = Xdirinstall ]; then
- skiptask confdir
- export FAI=$FAI_CONFIGDIR
- set -a
Deleted: people/michael/experimental/patches/bugfix-495535
===================================================================
--- people/michael/experimental/patches/bugfix-495535 2009-04-17 16:33:09 UTC (rev 5355)
+++ people/michael/experimental/patches/bugfix-495535 2009-04-18 07:51:07 UTC (rev 5356)
@@ -1,35 +0,0 @@
-2009-02-13 Michael Tautschnig <mt at debian.org>
-
- * bin/fai-chboot: Make -k work again, even if -i or -o is not used
- (closes: #495535)
- * man/fai-chboot.8: Don't claim -i does the same as -k ..., just give a few
- hints about the options set by default
-Index: trunk/bin/fai-chboot
-===================================================================
---- trunk.orig/bin/fai-chboot
-+++ trunk/bin/fai-chboot
-@@ -443,7 +443,10 @@
- } else {
- $kernelname = shift;
- $kernelname = "kernel $kernelname";
--# $rootfs = shift or die "No rootfs specified.\n";
-+ $initrd = '';
-+ $rootfs = '';
-+ $bootprot = '';
-+ $flags = '';
- }
-
- $opt_F and $opt_f="verbose,sshd,createvt";
-Index: trunk/man/fai-chboot.8
-===================================================================
---- trunk.orig/man/fai-chboot.8
-+++ trunk/man/fai-chboot.8
-@@ -79,7 +79,7 @@
- Show simple help and version.
- .TP
- .B \-i
--Set parameters for booting the FAI install kernel. Same as -k "ip=dhcp" vmlinuz-install /dev/nfs. This does not set FAI_ACTION.
-+Set parameters for booting the FAI install kernel (proper initrd, boot from nfs). This does not set FAI_ACTION.
- .TP
- .B \-I
- Same as -i but also sets FAI_ACTION=install. So a fully automatic
Modified: people/michael/experimental/patches/bugfix-524347
===================================================================
--- people/michael/experimental/patches/bugfix-524347 2009-04-17 16:33:09 UTC (rev 5355)
+++ people/michael/experimental/patches/bugfix-524347 2009-04-18 07:51:07 UTC (rev 5356)
@@ -39,7 +39,7 @@
===================================================================
--- trunk.orig/bin/make-fai-nfsroot
+++ trunk/bin/make-fai-nfsroot
-@@ -248,7 +248,7 @@
+@@ -262,7 +262,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
add_all_host_entries() {
Modified: people/michael/experimental/patches/grub-pc
===================================================================
--- people/michael/experimental/patches/grub-pc 2009-04-17 16:33:09 UTC (rev 5355)
+++ people/michael/experimental/patches/grub-pc 2009-04-18 07:51:07 UTC (rev 5356)
@@ -20,7 +20,7 @@
===================================================================
--- trunk.orig/examples/simple/package_config/DEFAULT
+++ trunk/examples/simple/package_config/DEFAULT
-@@ -14,7 +14,10 @@
+@@ -17,7 +17,10 @@
dhcp3-client
PACKAGES aptitude GRUB
Modified: people/michael/experimental/patches/logtail
===================================================================
--- people/michael/experimental/patches/logtail 2009-04-17 16:33:09 UTC (rev 5355)
+++ people/michael/experimental/patches/logtail 2009-04-18 07:51:07 UTC (rev 5356)
@@ -6,7 +6,7 @@
===================================================================
--- trunk.orig/bin/fai
+++ trunk/bin/fai
-@@ -281,6 +281,9 @@
+@@ -280,6 +280,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() {
-@@ -418,6 +422,7 @@
+@@ -419,6 +423,7 @@
mkdir -p $FAI_ROOT/var/lib/fai
mkdir -p $FAI_ROOT/var/log/fai
Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series 2009-04-17 16:33:09 UTC (rev 5355)
+++ people/michael/experimental/patches/series 2009-04-18 07:51:07 UTC (rev 5356)
@@ -2,11 +2,9 @@
bugfix-464541
grub-pc
bugfix-506459
-bugfix-456978
bugfix-412889
bugfix-313397
bugfix-481871
-bugfix-495535
setup-storage_gpt-bios
bugfix-479537
setup-storage_full-crypto-support
More information about the Fai-commit
mailing list