Merge remote-tracking branch 'origin/myplc-0_4-branch' into planetlab-3_3-bootcd...

[pl_sshd.git] / pl_sshd.spec

diff --git a/pl_sshd.spec b/pl_sshd.spec
index da87b21..0cb7a7f 100644 (file)
--- a/pl_sshd.spec
+++ b/pl_sshd.spec
@@ -1,6 +1,6 @@
 %define name pl_sshd
 %define version 1.0
-%define release 10.planetlab%{?date:.%{date}}
+%define release 10%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -68,9 +68,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