[Fai-commit] r5316 - people/michael/experimental/patches
Michael Tautschnig
mt at alioth.debian.org
Thu Apr 9 17:17:01 UTC 2009
Author: mt
Date: 2009-04-09 17:17:01 +0000 (Thu, 09 Apr 2009)
New Revision: 5316
Removed:
people/michael/experimental/patches/bugfix-439250
people/michael/experimental/patches/bugfix-441436
people/michael/experimental/patches/bugfix-444210
people/michael/experimental/patches/bugfix-504801
people/michael/experimental/patches/bugfix-513090
people/michael/experimental/patches/bugfix-515057
Modified:
people/michael/experimental/patches/series
Log:
removed patches that Thomas applied in trunk
Deleted: people/michael/experimental/patches/bugfix-439250
===================================================================
--- people/michael/experimental/patches/bugfix-439250 2009-04-09 15:02:43 UTC (rev 5315)
+++ people/michael/experimental/patches/bugfix-439250 2009-04-09 17:17:01 UTC (rev 5316)
@@ -1,17 +0,0 @@
-2009-02-13 Michael Tautschnig <mt at debian.org>
-
- * lib/subroutines-linux: Don't rely on ' as a field separator when parsing
- boot.log, use = and strip off any quotes (closes: #439250)
-Index: trunk/lib/subroutines-linux
-===================================================================
---- trunk.orig/lib/subroutines-linux
-+++ trunk/lib/subroutines-linux
-@@ -288,7 +288,7 @@
- local frsh
- local doexit=0
- local hostname=$(hostname)
-- local ipaddr=$(grep IPADDR $LOGDIR/boot.log | cut -d\' -f2)
-+ local ipaddr=$(grep IPADDR $LOGDIR/boot.log | cut -d'=' -f2 | sed "s/'//g")
- local remotesh
-
- case "$FAI_LOGPROTO" in
Deleted: people/michael/experimental/patches/bugfix-441436
===================================================================
--- people/michael/experimental/patches/bugfix-441436 2009-04-09 15:02:43 UTC (rev 5315)
+++ people/michael/experimental/patches/bugfix-441436 2009-04-09 17:17:01 UTC (rev 5316)
@@ -1,44 +0,0 @@
-2009-02-13 Michael Tautschnig <mt at debian.org>
-
- * lib/get-config-dir-svn: Make username in svn:// config url optional (thanks
- Alexander Fisher) (closes: #441436)
-Index: trunk/lib/get-config-dir-svn
-===================================================================
---- trunk.orig/lib/get-config-dir-svn
-+++ trunk/lib/get-config-dir-svn
-@@ -12,7 +12,11 @@
- # matched string: "svn://user@host/svnpath"
- protocol=$(expr match "$FAI_CONFIG_SRC" '\([^:]*\)://')
- username=$(expr match "$FAI_CONFIG_SRC" '[^:]*://\([^@]*\)@')
--svnpath=$(expr match "$FAI_CONFIG_SRC" '[^:]*://[^@]\+@\([^[:space:]]\+\)')
-+if [ -n "$username" ] ; then
-+ svnpath=$(expr match "$FAI_CONFIG_SRC" '[^:]*://[^@]\+@\([^[:space:]]\+\)')
-+else
-+ svnpath=$(expr match "$FAI_CONFIG_SRC" '[^:]*://\([^[:space:]]\+\)')
-+fi
-
- case $protocol in
- svn)
-@@ -28,9 +32,11 @@
- svnurl="https://$svnpath"
- ;;
- svn+ssh)
-- svnurl="svn+ssh://$username@$svnpath"
-- # this is a bit hackish: if $username is empty, the path gets corrected below...
-- # explaination: svn co -username foo svn+ssh://bar doesnt work as svn co svn+ssh://foo@bar
-+ if [ -n "$username" ] ; then
-+ svnurl="svn+ssh://$username@$svnpath"
-+ else
-+ svnurl=$FAI_CONFIG_SRC
-+ fi
- ;;
- *)
- echo "get-config-dir-svn: protocol $protocol not implemented"
-@@ -39,7 +45,6 @@
- esac
-
- [ -n "$username" ] && user="--username $username"
--[ -z "$username" ] && svnurl=$FAI_CONFIG_SRC
-
- if [ -d "$FAI/.svn" ] ; then
- echo "Updating SVN in $FAI"
Deleted: people/michael/experimental/patches/bugfix-444210
===================================================================
--- people/michael/experimental/patches/bugfix-444210 2009-04-09 15:02:43 UTC (rev 5315)
+++ people/michael/experimental/patches/bugfix-444210 2009-04-09 17:17:01 UTC (rev 5316)
@@ -1,83 +0,0 @@
-2009-02-13 Michael Tautschnig <mt at debian.org>
-
- * lib/get-config-dir-*: task_error requires the exit code of the preceeding
- command as the second argument
- * lib/subroutines-linux: The exit code of a command earlier in a pipe must be
- read using $PIPESTATUS, not $? (closes: #444210)
-Index: trunk/lib/get-config-dir-cvs
-===================================================================
---- trunk.orig/lib/get-config-dir-cvs
-+++ trunk/lib/get-config-dir-cvs
-@@ -36,11 +36,11 @@
- echo "Updating CVS in $FAI"
- cd $FAI
- cvs -q up -P $tag -d -C > $LOGDIR/getconf.log
-- task_error 701
-+ task_error 701 $?
- else
- echo "Checking out CVS"
- cd $(dirname "$FAI")
- cvs -q co -P -d $(basename "$FAI") \
- $tag $module > $LOGDIR/getconf.log
-- task_error 702
-+ task_error 702 $?
- fi
-Index: trunk/lib/get-config-dir-git
-===================================================================
---- trunk.orig/lib/get-config-dir-git
-+++ trunk/lib/get-config-dir-git
-@@ -32,9 +32,9 @@
- echo "Updating git copy in $FAI"
- cd $FAI
- git pull
-- task_error 701
-+ task_error 701 $?
- else
- echo "Checking out from git"
- git clone $giturl $FAI
-- task_error 702
-+ task_error 702 $?
- fi
-Index: trunk/lib/get-config-dir-nfs
-===================================================================
---- trunk.orig/lib/get-config-dir-nfs
-+++ trunk/lib/get-config-dir-nfs
-@@ -12,4 +12,4 @@
-
- mount -n $romountopt $server:$nfspath $FAI &&
- echo "Configuration space $server:$nfspath mounted to $FAI"
--task_error 701
-+task_error 701 $?
-Index: trunk/lib/get-config-dir-svn
-===================================================================
---- trunk.orig/lib/get-config-dir-svn
-+++ trunk/lib/get-config-dir-svn
-@@ -50,9 +50,9 @@
- echo "Updating SVN in $FAI"
- cd $FAI
- svn up $user | grep -v 'Updated to revision' > $LOGDIR/getconf.log
-- task_error 701
-+ task_error 701 $?
- else
- echo "Checking out SVN"
- svn co $user $svnurl $FAI | grep -v 'Checked out revision' > $LOGDIR/getconf.log
-- task_error 702
-+ task_error 702 $?
- fi
-Index: trunk/lib/subroutines-linux
-===================================================================
---- trunk.orig/lib/subroutines-linux
-+++ trunk/lib/subroutines-linux
-@@ -250,10 +250,10 @@
- echo "Installing software may take a while"
- if [ "$debug" ]; then
- install_packages | tee -a $LOGDIR/software.log
-- task_error 471 $?
-+ task_error 471 ${PIPESTATUS[0]}
- elif [ "$verbose" ]; then
- install_packages </dev/null 2>&1 | tee -a $LOGDIR/software.log
-- task_error 471 $?
-+ task_error 471 ${PIPESTATUS[0]}
- else
- install_packages </dev/null >> $LOGDIR/software.log 2>&1
- task_error 471 $?
Deleted: people/michael/experimental/patches/bugfix-504801
===================================================================
--- people/michael/experimental/patches/bugfix-504801 2009-04-09 15:02:43 UTC (rev 5315)
+++ people/michael/experimental/patches/bugfix-504801 2009-04-09 17:17:01 UTC (rev 5316)
@@ -1,20 +0,0 @@
-2009-02-13 Michael Tautschnig <mt at debian.org>
-
- * bin/fai-setup: Do not unconditionally add $FAI_CONFIGDIR to exports(5)
- (thanks Sebastian Harl) (closes: #504801)
-Index: trunk/bin/fai-setup
-===================================================================
---- trunk.orig/bin/fai-setup
-+++ trunk/bin/fai-setup
-@@ -178,7 +178,10 @@
-
- addr=$(LC_ALL=C ifconfig $SERVERINTERFACE | grep -v 127.0.0.1 | perl -ne '/addr:([\d.]+)/ && print"$1\n"'|head -1)
- mask=$(LC_ALL=C ifconfig $SERVERINTERFACE | grep -v 127.0.0.1 | perl -ne '/Mask:([\d.]+)/ && print"$1\n"'|head -1)
-- add_export_line $FAI_CONFIGDIR "$addr/$mask(async,ro,no_subtree_check)"
-+
-+ if expr match "$FAI_CONFIG_SRC" 'nfs:\/\/' > /dev/null; then
-+ add_export_line $FAI_CONFIGDIR "$addr/$mask(async,ro,no_subtree_check)"
-+ fi
- add_export_line $NFSROOT "$addr/$mask(async,ro,no_subtree_check,no_root_squash)"
- if [ -z "$nfsserver" ]; then
- echo "Could not find the type of your nfs server. Maybe"
Deleted: people/michael/experimental/patches/bugfix-513090
===================================================================
--- people/michael/experimental/patches/bugfix-513090 2009-04-09 15:02:43 UTC (rev 5315)
+++ people/michael/experimental/patches/bugfix-513090 2009-04-09 17:17:01 UTC (rev 5316)
@@ -1,34 +0,0 @@
-2009-02-13 Michael Tautschnig <mt at debian.org>
-
- * bin/faimond: Try to load Proc::Daemon only in case -d is given; if it fails,
- print a helpful error message (closes: #513090)
-Index: trunk/bin/faimond
-===================================================================
---- trunk.orig/bin/faimond
-+++ trunk/bin/faimond
-@@ -15,7 +15,6 @@
- use strict;
- use Socket;
- use Getopt::Std;
--use Proc::Daemon;
-
- $| = 1;
- my ($port, $timeout, $daemon, $timestamp);
-@@ -78,7 +77,7 @@
- }
- close(PIDFILE);
- }
-- Proc::Daemon::Init;
-+ eval "Proc::Daemon::Init";
- umask 022;
-
- open(PIDFILE, '>', "$pidfile") or die "open $pidfile: $!";
-@@ -177,6 +176,8 @@
- }
-
- if (defined($opt_d)) {
-+ (eval "require Proc::Daemon") or
-+ die "Daemon mode not available, Proc::Daemon not found. Please install libproc-daemon-perl\n";
- # If in daemon mode, use standard daemon log file
- $logfile = $daemonlogfile;
- }
Deleted: people/michael/experimental/patches/bugfix-515057
===================================================================
--- people/michael/experimental/patches/bugfix-515057 2009-04-09 15:02:43 UTC (rev 5315)
+++ people/michael/experimental/patches/bugfix-515057 2009-04-09 17:17:01 UTC (rev 5316)
@@ -1,36 +0,0 @@
-2009-02-13 Michael Tautschnig <mt at debian.org>
-
- * lib/get-config-dir-svn: Added support for password in SVN URL (thanks Robin
- Powell) (closes: #515057)
-Index: trunk/lib/get-config-dir-svn
-===================================================================
---- trunk.orig/lib/get-config-dir-svn
-+++ trunk/lib/get-config-dir-svn
-@@ -11,9 +11,13 @@
-
- # matched string: "svn://user@host/svnpath"
- protocol=$(expr match "$FAI_CONFIG_SRC" '\([^:]*\)://')
--username=$(expr match "$FAI_CONFIG_SRC" '[^:]*://\([^@]*\)@')
-+# username may or may not be followed by a password
-+username=$(expr match "$FAI_CONFIG_SRC" '[^:]*://\([^@:]*\)[^@]*@')
- if [ -n "$username" ] ; then
- svnpath=$(expr match "$FAI_CONFIG_SRC" '[^:]*://[^@]\+@\([^[:space:]]\+\)')
-+ # password definitely is preceded by a username
-+ password=$(expr match "$FAI_CONFIG_SRC" '[^:]*://[^@:]*:\([^@]*\)@')
-+ [ -n "$password" ] && pass="--password $password"
- else
- svnpath=$(expr match "$FAI_CONFIG_SRC" '[^:]*://\([^[:space:]]\+\)')
- fi
-@@ -49,10 +53,10 @@
- if [ -d "$FAI/.svn" ] ; then
- echo "Updating SVN in $FAI"
- cd $FAI
-- svn up $user | grep -v 'Updated to revision' > $LOGDIR/getconf.log
-+ svn up $user $pass | grep -v 'Updated to revision' > $LOGDIR/getconf.log
- task_error 701 $?
- else
- echo "Checking out SVN"
-- svn co $user $svnurl $FAI | grep -v 'Checked out revision' > $LOGDIR/getconf.log
-+ svn co $user $pass $svnurl $FAI | grep -v 'Checked out revision' > $LOGDIR/getconf.log
- task_error 702 $?
- fi
Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series 2009-04-09 15:02:43 UTC (rev 5315)
+++ people/michael/experimental/patches/series 2009-04-09 17:17:01 UTC (rev 5316)
@@ -1,14 +1,8 @@
logtail
bugfix-464541
grub-pc
-bugfix-439250
-bugfix-504801
-bugfix-441436
bugfix-506459
-bugfix-513090
bugfix-456978
-bugfix-444210
-bugfix-515057
bugfix-412889
bugfix-313397
bugfix-481871
More information about the Fai-commit
mailing list