git://git.onelab.eu
/
pl_sshd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[pl_sshd.git]
/
pl_sshd.spec
diff --git
a/pl_sshd.spec
b/pl_sshd.spec
index
2bc2551
..
0cb7a7f
100644
(file)
--- a/
pl_sshd.spec
+++ b/
pl_sshd.spec
@@
-1,6
+1,6
@@
%define name pl_sshd
%define version 1.0
%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>
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
@@
-33,7
+33,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
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
%clean
rm -rf $RPM_BUILD_ROOT
@@
-43,7
+42,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
%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
%pre
@@
-70,9
+68,11
@@
if [ $1 -ge 1 ]; then
#
[ "$PL_BOOTCD" != "1" ] && /etc/init.d/autofs stop
auto_master=/etc/auto.master
#
[ "$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
[ "$PL_BOOTCD" != "1" ] && /etc/init.d/autofs start
fi
@@
-109,6
+109,10
@@
fi
%changelog
%changelog
+* 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
* Wed Oct 12 2005 Steve Muir <smuir@cs.princeton.edu>
- fix pl_sshd script name and argv[0] to satisfy re-exec requirements