Package: fai-server
Version: 3.2.16
Severity: normal
svn+https: for FAI_CONFIG_SRC doesn't work with a user:p...@host
type URI. Here's a patch.
--- /srv/fai/nfsroot/live/filesystem.dir/usr/lib/fai/get-config-dir-svn
2009-01-12 04:13:18.000000000 -0800
+++ /srv/fai/broken/get-config-dir-svn 2009-02-11 18:05:40.000000000 -0800
@@ -11,7 +11,10 @@
# matched string: "svn://u...@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" '[^:]*://\([^@:]*\)[...@]*@')
+# password definitely is preceded by a username
+password=$(expr match "$FAI_CONFIG_SRC" '[^:]*://[^@:]*:\([...@]*\)@')
svnpath=$(expr match "$FAI_CONFIG_SRC" '[^:]*://[...@]\+@\([^[:space:]]\+\)')
case $protocol in
@@ -38,8 +41,13 @@
;;
esac
-[ -n "$username" ] && user="--username $username"
-[ -z "$username" ] && svnurl=$FAI_CONFIG_SRC
+if [ -n "$username" ]
+then
+ user="--username $username"
+ [ -n "$password" ] && pass="--password $password"
+else
+ svnurl=$FAI_CONFIG_SRC
+fi
if [ -d "$FAI/.svn" ] ; then
echo "Updating SVN in $FAI"
@@ -48,6 +56,6 @@
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
-- System Information:
Debian Release: 5.0
APT prefers testing
APT policy: (650, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.20.4-ls3-ls2 (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/bash
Versions of packages fai-server depends on:
ii debootstrap 1.0.10lenny1 Bootstrap a basic Debian system
ii fai-client 3.2.16 Fully Automatic Installation clien
Versions of packages fai-server recommends:
ii dhcp3-server 3.1.1-5 DHCP server for automatic IP addre
ii nfs-kernel-server 1:1.1.2-6lenny1 support for NFS kernel server
ii openbsd-inetd [inet-supe 0.20080125-2 The OpenBSD Internet Superserver
ii openssh-client 1:4.3p2-9etch3 Secure shell client, an rlogin/rsh
ii openssh-server 1:4.3p2-9etch3 Secure shell server, an rshd repla
ii syslinux-common 2:3.71+dfsg-5 Kernel loader which uses a FAT, ex
ii tftpd-hpa 0.48-2.3 HPA's tftp server
Versions of packages fai-server suggests:
ii apt-move 4.2.27-1+b5 Maintain Debian packages in a pack
ii aptitude 0.4.11.11-1~lenny1 terminal-based package manager
pn debmirror <none> (no description available)
ii genisoimage 9:1.1.9-1 Creates ISO-9660 CD-ROM filesystem
ii grub 0.97-47lenny2 GRand Unified Bootloader (Legacy v
pn libproc-daemon-perl <none> (no description available)
pn perl-tk <none> (no description available)
-- no debconf information
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
