X-Git-Url: http://git.onelab.eu/?p=pl_sshd.git;a=blobdiff_plain;f=pl_sshd.spec;h=b7408f195724065b8f24c06819ed7f59e9f80f13;hp=2bc2551ed1a08e4147484538f1548ea3b31716ae;hb=HEAD;hpb=8e4f5a60c50733819fbc452b224040233429264d

diff --git a/pl_sshd.spec b/pl_sshd.spec
index 2bc2551..b7408f1 100644
--- a/pl_sshd.spec
+++ b/pl_sshd.spec
@@ -1,17 +1,24 @@
+#
+# $Id$
+#
+%define url $URL$
+
 %define name pl_sshd
 %define version 1.0
-%define release 10.planetlab%{?date:.%{date}}
+%define taglevel 11
+
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 3.0
-URL: http://cvs.planet-lab.org/cvs/pl_sshd
+Distribution: PlanetLab %{plrelease}
+URL: %(echo %{url} | cut -d ' ' -f 2)
 
 Summary: SSH server config for PlanetLab
 Name: %{name}
 Version: %{version}
 Release: %{release}
-Requires: autofs, openssh-server
+Requires: openssh-server
 License: GPL
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -33,7 +40,6 @@ directory.
 mkdir -p $RPM_BUILD_ROOT/var/pl_sshd/keys
 install -D -m 0755 pl_sshd.sh $RPM_BUILD_ROOT/usr/local/sbin/pl_sshd
 install -D -m 0755 pl_sshd $RPM_BUILD_ROOT/etc/init.d/pl_sshd
-install -D -m 0755 auto.pl_sshd.py $RPM_BUILD_ROOT/etc/auto.pl_sshd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,7 +49,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/pl_sshd/keys
 %attr(0755,root,root) /usr/local/sbin/pl_sshd
 %attr(0755,root,root) /etc/init.d/pl_sshd
-%attr(0755,root,root) /etc/auto.pl_sshd
 
 %pre
 
@@ -70,9 +75,11 @@ if [ $1 -ge 1 ]; then
 	#
 	[ "$PL_BOOTCD" != "1" ] && /etc/init.d/autofs stop
 	auto_master=/etc/auto.master
-	mv $auto_master $auto_master.pl_sshd.post
-	sed -e '\,^/var/pl_sshd/keys,d' $auto_master.pl_sshd.post \
-	    >$auto_master
+	orig=$auto_master
+	backup=$auto_master.pl_sshd.post
+	mv $orig $backup
+	sed -e '\,^/var/pl_sshd/keys,d' $backup > $orig && rm $backup || \
+	    mv $backup $orig
 
 	[ "$PL_BOOTCD" != "1" ] && /etc/init.d/autofs start
     fi
@@ -109,6 +116,13 @@ fi
 
 
 %changelog
+* Fri May 09 2008 Stephen Soltesz <soltesz@cs.princeton.edu> - pl_sshd-1.0-11
+- 
+
+* Wed Nov  2 2005 Steve Muir <smuir@cs.princeton.edu>
+- don't fanny around using the automounter to access ssh keys in vservers,
+  pl_conf now writes them into the normal locations
+
 * Wed Oct 12 2005 Steve Muir <smuir@cs.princeton.edu>
 - fix pl_sshd script name and argv[0] to satisfy re-exec requirements