[Fai-commit] r3075 - in trunk: bin debian

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-21 20:27:17 +0000 (Mon, 21 Nov 2005)
New Revision: 3075

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
new test if ssh package is installed (closes: #322759)


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2005-11-21 16:29:12 UTC (rev 3074)
+++ trunk/bin/make-fai-nfsroot	2005-11-21 20:27:17 UTC (rev 3075)
@@ -170,7 +170,7 @@
 setup_ssh() {
 
     # nothing to do if no ssh is available in nfsroot
-    [ -f $NFSROOT/var/lib/dpkg/info/ssh.list ] || return 0
+    [ -f $NFSROOT/usr/bin/ssh ] || return 0
     mkdir -p -m 700 $NFSROOT/root/.ssh
     if [ -n "$LOGUSER" ] ; then
         loguserhome=`eval "cd ~$LOGUSER 2>/dev/null && pwd;true"`

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-21 16:29:12 UTC (rev 3074)
+++ trunk/debian/changelog	2005-11-21 20:27:17 UTC (rev 3075)
@@ -22,10 +22,11 @@
   * fcopy: add preinst support, fix for inforing .svn dirs (closes: #297550)
   * fai-guide.sgml: include README.disk_config into fai guide, minor
     fixes, (closes: #332295, #332318, #332293, #332291)
-  * make-fai-nfsroot: use --one-file-system instead of -l (closes: #308806)
+  * make-fai-nfsroot: use --one-file-system instead of -l (closes: #308806),
+    new test if ssh package is installed (closes: #322759) 
   * subroutines: test if hooks are executable (closes: #338524)
   
- -- Thomas Lange <lange at debian.org>  Sun, 20 Nov 2005 21:43:26 +0100
+ -- Thomas Lange <lange at debian.org>  Mon, 21 Nov 2005 21:26:53 +0100
 
 fai (2.8.4) unstable; urgency=high