[Fai-commit] r5434 - people/michael/experimental/patches
Michael Tautschnig
mt at alioth.debian.org
Sun Jul 19 13:51:07 UTC 2009
Author: mt
Date: 2009-07-19 13:51:05 +0000 (Sun, 19 Jul 2009)
New Revision: 5434
Removed:
people/michael/experimental/patches/bugfix-515704
people/michael/experimental/patches/bugfix-524347
Modified:
people/michael/experimental/patches/bugfix-412889
people/michael/experimental/patches/logtail
people/michael/experimental/patches/series
Log:
refreshed patches to match current trunk
Modified: people/michael/experimental/patches/bugfix-412889
===================================================================
--- people/michael/experimental/patches/bugfix-412889 2009-07-19 10:08:17 UTC (rev 5433)
+++ people/michael/experimental/patches/bugfix-412889 2009-07-19 13:51:05 UTC (rev 5434)
@@ -7,7 +7,7 @@
===================================================================
--- trunk.orig/bin/fai-mirror
+++ trunk/bin/fai-mirror
-@@ -151,6 +151,8 @@
+@@ -123,6 +123,8 @@
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
delete_base_packages() {
@@ -16,7 +16,7 @@
# now delete all packages that are already included in base.tgz
local p
-@@ -162,14 +164,18 @@
+@@ -134,14 +136,18 @@
fi
echo "Removing packages that are already included in base.tgz"
for p in $(cat $NFSROOT/var/tmp/base-pkgs.lis); do
@@ -39,7 +39,7 @@
done
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-@@ -225,7 +231,8 @@
+@@ -197,7 +203,8 @@
verbose=0
add=1
qflag=-qq
@@ -49,7 +49,7 @@
case "$opt" in
B) add=0 ;;
C) cfdir=$OPTARG ;;
-@@ -234,6 +241,7 @@
+@@ -206,6 +213,7 @@
c) cclasses="$OPTARG";;
p) preserve=1;;
v) verbose=1; vflag=-v; qflag='';;
@@ -57,7 +57,7 @@
?) die 1 "Unknown option";;
esac
done
-@@ -291,17 +299,26 @@
+@@ -263,16 +271,25 @@
# TODO: use -p to preserve sources.list
perl -p -e 's/file:/copy:/' $cfdir/apt/sources.list > $aptcache/etc/apt/sources.list
@@ -76,7 +76,6 @@
+ echo "Downloading packages for classes:" $classes
+ FAI=$FAI_CONFIGDIR install_packages -d $vflag
+ [ $add -eq 1 ] && add_base_packages
-+ get_addpackages
+ umount_dirs
+ trap "" EXIT ERR
+ [ $add -eq 0 ] && delete_base_packages $arch
@@ -85,7 +84,6 @@
-echo "Downloading packages for classes:" $classes
-FAI=$FAI_CONFIGDIR install_packages -d $vflag
-[ $add -eq 1 ] && add_base_packages
--get_addpackages
-umount_dirs
-trap "" EXIT ERR
-[ $add -eq 0 ] && delete_base_packages
@@ -94,7 +92,7 @@
# create mirror directory structure
echo "Calling apt-move"
-@@ -316,21 +333,55 @@
+@@ -287,21 +304,55 @@
PKGCOMP='none gzip'
EOF
apt-move $qflag -c $aptmovefile update
Deleted: people/michael/experimental/patches/bugfix-515704
===================================================================
--- people/michael/experimental/patches/bugfix-515704 2009-07-19 10:08:17 UTC (rev 5433)
+++ people/michael/experimental/patches/bugfix-515704 2009-07-19 13:51:05 UTC (rev 5434)
@@ -1,35 +0,0 @@
-2009-06-13 Michael Tautschnig <mt at debian.org>
-
- * fai-savelog: Fixed cd to wrong dir when $LOGREMOTEDIR was set (thanks Robin
- Powell for the patch and Jens Rosenboom for another bugfix)
- (closes: #515704)
-Index: trunk/lib/fai-savelog
-===================================================================
---- trunk.orig/lib/fai-savelog
-+++ trunk/lib/fai-savelog
-@@ -58,18 +58,21 @@
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- save_log_remote_shell() {
-
-- local thislog
-+ local thislogdir
- if [ -n "$LOGREMOTEDIR" ];then
-- thislog=$LOGREMOTEDIR/$HOSTNAME/$FAI_ACTION-$fai_rundate
-+ thislogdir=$LOGREMOTEDIR/$HOSTNAME
- else
-- thislog=$HOSTNAME/$FAI_ACTION-$fai_rundate
-+ thislogdir=$HOSTNAME
- fi
-
-+ local thislog
-+ thislog=$thislogdir/$FAI_ACTION-$fai_rundate
-+
- echo "Save log files via $remotesh to $LOGUSER@$LOGSERVER:$thislog"
- find $LOGDIR -size 0 -type f -exec rm {} \;
- $remotesh -l $LOGUSER $LOGSERVER " \
- mkdir -p $thislog ;\
-- cd $HOSTNAME ;\
-+ cd $thislogdir ;\
- rm -f last-$FAI_ACTION ;\
- ln -snf $FAI_ACTION-$fai_rundate last-$FAI_ACTION ;\
- ln -snf $FAI_ACTION-$fai_rundate last"
Deleted: people/michael/experimental/patches/bugfix-524347
===================================================================
--- people/michael/experimental/patches/bugfix-524347 2009-07-19 10:08:17 UTC (rev 5433)
+++ people/michael/experimental/patches/bugfix-524347 2009-07-19 13:51:05 UTC (rev 5434)
@@ -1,132 +0,0 @@
-2009-03-21 Luk Claes <luk.claes at ugent.be>
-
- * debian/control: Depends: iproute for fai-client, fai-server.
- * fai-setup, make-fai-nfsroot: Replaced all calls to ifconfig by proper ip +
- shell magic calls (closes: #524347).
- * subroutine-linux, get-boot-info, task_sysinfo: Likewise.
- * simple example: Likewise.
-Index: trunk/bin/fai-setup
-===================================================================
---- trunk.orig/bin/fai-setup
-+++ trunk/bin/fai-setup
-@@ -115,7 +115,7 @@
- [ -f /etc/ssh/ssh_host_dsa_key.pub ] && DSASERVER=$(sed -e "s/= .*$/=/" /etc/ssh/ssh_host_dsa_key.pub)
- [ -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 | grep -v 127.0.0.1)
- for ip in $ips; do
- hname=$(getent hosts $ip| tr -s ' ' ',')
- [ -z "$hname" ] && hname=$ip
-@@ -176,13 +176,12 @@
- test -f /etc/init.d/nfs-kernel-server && nfsserver=nfs-kernel-server
- test -f /etc/init.d/nfs-user-server && nfsserver=nfs-user-server
-
-- 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)
-+ addr=$(ip addr show dev $SERVERINTERFACE | grep -w inet | cut -d t -f 2 | cut -d ' ' -f 2 | cut -d / -f 1 | grep -v 127.0.0.1 | head -1)
-
- if expr match "$FAI_CONFIG_SRC" 'nfs:\/\/' > /dev/null; then
-- add_export_line $FAI_CONFIGDIR "$addr/$mask(async,ro,no_subtree_check)"
-+ add_export_line $FAI_CONFIGDIR "$addr(async,ro,no_subtree_check)"
- fi
-- add_export_line $NFSROOT "$addr/$mask(async,ro,no_subtree_check,no_root_squash)"
-+ add_export_line $NFSROOT "$addr(async,ro,no_subtree_check,no_root_squash)"
- if [ -z "$nfsserver" ]; then
- echo "Could not find the type of your nfs server. Maybe"
- echo "no nfs server is installed. I can't restart it."
-Index: trunk/bin/make-fai-nfsroot
-===================================================================
---- trunk.orig/bin/make-fai-nfsroot
-+++ trunk/bin/make-fai-nfsroot
-@@ -262,7 +262,7 @@
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- add_all_host_entries() {
-
-- local ips=$(ifconfig | grep -w inet | cut -d : -f 2 | cut -d ' ' -f 1 | grep -v 127.0.0.1)
-+ local 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)
- for eth in $ips; do
- getent hosts $eth >> etc/hosts || true
- done
-Index: trunk/debian/control
-===================================================================
---- trunk.orig/debian/control
-+++ trunk/debian/control
-@@ -12,7 +12,7 @@
-
- Package: fai-client
- Architecture: all
--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
- Conflicts: fai, fai-kernels
-@@ -42,7 +42,7 @@
- Package: fai-server
- Architecture: all
- Depends: fai-client, debootstrap
--Recommends: nfs-kernel-server, dhcp3-server | bootp, tftpd-hpa | tftpd, openssh-server, openssh-client, syslinux-common, openbsd-inetd | inet-superserver
-+Recommends: nfs-kernel-server, dhcp3-server | bootp, tftpd-hpa | tftpd, openssh-server, openssh-client, syslinux-common, openbsd-inetd | inet-superserver, iproute
- Suggests: debmirror, apt-move, genisoimage, grub, aptitude, perl-tk, libproc-daemon-perl
- Conflicts: fai
- Replaces: fai
-Index: trunk/examples/simple/files/etc/rc2.d/S99fai-setup/FAISERVER
-===================================================================
---- trunk.orig/examples/simple/files/etc/rc2.d/S99fai-setup/FAISERVER
-+++ trunk/examples/simple/files/etc/rc2.d/S99fai-setup/FAISERVER
-@@ -13,7 +13,7 @@
-
- # setup network
- dhclient eth0 # connection to the outside world (hopefully)
--ifconfig eth0:1 192.168.1.250 # (fixed address of faiserver)
-+ip addr add 192.168.1.250 dev eth0 # (fixed address of faiserver)
- /etc/init.d/nscd restart
- /etc/init.d/apache2 restart
- /etc/init.d/apt-proxy restart
-Index: trunk/lib/get-boot-info
-===================================================================
---- trunk.orig/lib/get-boot-info
-+++ trunk/lib/get-boot-info
-@@ -41,14 +41,14 @@
- netdevice_info() {
-
- # devices that are running
-- netdevices_up=$(ifconfig | perl -anF'\s+' -e 'print "$F[0]\n" if $F[0];' | grep -v "^lo" | sort | uniq)
-+ netdevices_up=$(ip link | grep "^[1-9$]" | cut -d : -f 2 | cut -d ' ' -f 2 | grep -v "^lo" | sort | uniq)
- # netdevices is the list of ethernet devices which will be used for bootpc (maybe dhcp)
- # if not defined, use boot messages to determine network devices
- [ -n "$netdevices" ] || netdevices=$netdevices_up
-
- # some network driver do not echo eth0,..; they are not detected
- netdevices_all=$(dmesg| perl -ne 'print $&,"\n" if m/\beth[0-9]\b/')
-- tmp=$(ifconfig -a | awk '/^eth/ { print $1 }')
-+ tmp=$(ip link | grep "^[1-9]" | cut -d : -f 2 | cut -d ' ' -f 2 | grep "^eth")
- netdevices_all="$netdevices_all $tmp"
- netdevices_all=$(for dev in $netdevices_all; do echo $dev; done| sort | uniq)
-
-Index: trunk/lib/subroutines-linux
-===================================================================
---- trunk.orig/lib/subroutines-linux
-+++ trunk/lib/subroutines-linux
-@@ -271,7 +271,7 @@
-
- if [ $do_init_tasks -eq 1 ] ; then
- # show some local information
-- ifconfig; df
-+ ip addr; df
- # umount swap space
- swapoff -a
- fi
-Index: trunk/lib/task_sysinfo
-===================================================================
---- trunk.orig/lib/task_sysinfo
-+++ trunk/lib/task_sysinfo
-@@ -26,7 +26,7 @@
- lsusb
- echo "Ethernet cards found: $netdevices_all"
- echo "Ethernet cards running: $netdevices_up"
--ifconfig -a
-+ip addr
-
- [ -x "$(which sysinfo)" ] && sysinfo -class device -level all
-
Modified: people/michael/experimental/patches/logtail
===================================================================
--- people/michael/experimental/patches/logtail 2009-07-19 10:08:17 UTC (rev 5433)
+++ people/michael/experimental/patches/logtail 2009-07-19 13:51:05 UTC (rev 5434)
@@ -22,7 +22,7 @@
+++ trunk/debian/control
@@ -14,7 +14,7 @@
Architecture: all
- 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
+Suggests: ntfsprogs, dmsetup, cryptsetup, logtail
Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series 2009-07-19 10:08:17 UTC (rev 5433)
+++ people/michael/experimental/patches/series 2009-07-19 13:51:05 UTC (rev 5434)
@@ -8,9 +8,7 @@
bugfix-481871
bugfix-479537
setup-storage_full-crypto-support
-bugfix-524347
setup-storage_missing-raid-devs
-bugfix-515704
setup-storage_raid-preserve-entry-missing
setup-storage_udevsettle
bugfix-532321
More information about the Fai-commit
mailing list