[Fai-commit] r5341 - people/michael/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2009-04-16 15:52:01 +0000 (Thu, 16 Apr 2009)
New Revision: 5341

Modified:
   people/michael/experimental/patches/bugfix-412889
   people/michael/experimental/patches/bugfix-521027
   people/michael/experimental/patches/logtail
Log:
refreshed patches, patch for ifconfig issue will be renamed in next commit


Modified: people/michael/experimental/patches/bugfix-412889
===================================================================
--- people/michael/experimental/patches/bugfix-412889	2009-04-16 15:51:31 UTC (rev 5340)
+++ people/michael/experimental/patches/bugfix-412889	2009-04-16 15:52:01 UTC (rev 5341)
@@ -57,7 +57,7 @@
  	?) die 1 "Unknown option";;
      esac
  done
-@@ -288,17 +296,26 @@
+@@ -291,17 +299,26 @@
  # TODO: use -p to preserve sources.list
  perl -p -e 's/file:/copy:/' $cfdir/apt/sources.list > $aptcache/etc/apt/sources.list
  
@@ -94,7 +94,7 @@
  
  # create mirror directory structure
  echo "Calling apt-move"
-@@ -313,21 +330,55 @@
+@@ -316,21 +333,55 @@
  PKGCOMP='none gzip'
  EOF
  apt-move $qflag -c $aptmovefile update

Modified: people/michael/experimental/patches/bugfix-521027
===================================================================
--- people/michael/experimental/patches/bugfix-521027	2009-04-16 15:51:31 UTC (rev 5340)
+++ people/michael/experimental/patches/bugfix-521027	2009-04-16 15:52:01 UTC (rev 5341)
@@ -14,7 +14,7 @@
  	    [ -f /etc/ssh/ssh_host_rsa_key.pub ] && RSASERVER=$(sed -e "s/= .*$/=/" /etc/ssh/ssh_host_rsa_key.pub )
  	    # determine all IP addresses, and their host names
 -	    ips=$(LC_ALL=C ifconfig| perl -ne '/addr:([\d.]+)/ && print"$1\n"'|grep -v 127.0.0.1)
-+	    ips=$(ip addr | grep -w inet | cut -d t -f 2 | cut -d ' ' -f 2 | cut -d / -f 1 | grep -v 127.0.0.1)
++	    ips=$(ip addr | grep -w inet | cut -d t -f 2 | cut -d ' ' -f 2 | grep -v 127.0.0.1)
  	    for ip in $ips; do
  		hname=$(getent hosts $ip| tr -s ' ' ',')
  		[ -z "$hname" ] && hname=$ip
@@ -56,7 +56,7 @@
  Package: fai-client
  Architecture: all
  Section: admin
--Depends: perl, file, libapt-pkg-perl, libparse-recdescent-perl, liblinux-lvm-perl
+-Depends: perl, file, libapt-pkg-perl, libparse-recdescent-perl, liblinux-lvm-perl, net-tools
 +Depends: perl, file, libapt-pkg-perl, libparse-recdescent-perl, liblinux-lvm-perl, iproute
  Recommends: debconf-utils, cfengine2
  Suggests: ntfsprogs, dmsetup, cryptsetup, logtail
@@ -108,7 +108,7 @@
 ===================================================================
 --- trunk.orig/lib/subroutines-linux
 +++ trunk/lib/subroutines-linux	
-@@ -268,7 +268,7 @@
+@@ -270,7 +270,7 @@
  
      if [ $do_init_tasks -eq 1 ] ; then
  	# show some local information

Modified: people/michael/experimental/patches/logtail
===================================================================
--- people/michael/experimental/patches/logtail	2009-04-16 15:51:31 UTC (rev 5340)
+++ people/michael/experimental/patches/logtail	2009-04-16 15:52:01 UTC (rev 5341)
@@ -6,7 +6,7 @@
 ===================================================================
 --- trunk.orig/bin/fai
 +++ trunk/bin/fai	
-@@ -280,6 +280,9 @@
+@@ -281,6 +281,9 @@
      mkdir -p $LOGDIR
      ln -snf $action-$fai_rundate $LOGDIR/../last-$action
      ln -snf $action-$fai_rundate $LOGDIR/../last
@@ -22,7 +22,7 @@
 +++ trunk/debian/control	
 @@ -15,7 +15,7 @@
  Section: admin
- Depends: perl, file, libapt-pkg-perl, libparse-recdescent-perl, liblinux-lvm-perl
+ Depends: perl, file, libapt-pkg-perl, libparse-recdescent-perl, liblinux-lvm-perl, net-tools
  Recommends: debconf-utils, cfengine2
 -Suggests: ntfsprogs, dmsetup, cryptsetup
 +Suggests: ntfsprogs, dmsetup, cryptsetup, logtail