X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=pl_sshd.spec;h=d2c946899da63415e9ecb9de426a0b352de55858;hb=c7c302c3c13e3e1cbea740dfc6304228433b16c6;hp=da87b2176efa8b481f7c23a4ca52d558fb7ac4a6;hpb=2852b4ea661094c2c80883d22122c9d70bf72cc0;p=pl_sshd.git

diff --git a/pl_sshd.spec b/pl_sshd.spec
index da87b21..d2c9468 100644
--- a/pl_sshd.spec
+++ b/pl_sshd.spec
@@ -1,11 +1,18 @@
+#
+# $Id$
+#
+%define url $URL$
+
 %define name pl_sshd
 %define version 1.0
-%define release 10.planetlab%{?date:.%{date}}
+%define taglevel 10
+
+%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}
@@ -68,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