git://git.onelab.eu
/
pl_sshd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
680b875
)
- check $PL_BOOTCD instead of $RUNLEVEL
author
Mark Huang
<mlhuang@cs.princeton.edu>
Tue, 26 Jul 2005 18:51:53 +0000
(18:51 +0000)
committer
Mark Huang
<mlhuang@cs.princeton.edu>
Tue, 26 Jul 2005 18:51:53 +0000
(18:51 +0000)
pl_sshd.spec
patch
|
blob
|
history
diff --git
a/pl_sshd.spec
b/pl_sshd.spec
index
53a8e62
..
734d30d
100644
(file)
--- a/
pl_sshd.spec
+++ b/
pl_sshd.spec
@@
-49,8
+49,6
@@
rm -rf $RPM_BUILD_ROOT
%post
%post
-RUNLEVEL=`/sbin/runlevel`
-
# 1 = install, 2 = upgrade/reinstall
if [ $1 -ge 1 ]; then
# create the magic directory for automount
# 1 = install, 2 = upgrade/reinstall
if [ $1 -ge 1 ]; then
# create the magic directory for automount
@@
-78,7
+76,7
@@
if [ $1 -ge 1 ]; then
chkconfig --add pl_sshd
chkconfig --add pl_sshd
- if [[ "$
RUNLEVEL" != "unknown
" ]]; then
+ if [[ "$
PL_BOOTCD" != "1
" ]]; then
#
# don't try to start/restart various things automatically,
# it's too ugly (particularly if we're upgrading while
#
# don't try to start/restart various things automatically,
# it's too ugly (particularly if we're upgrading while
@@
-94,15
+92,13
@@
if [ $1 -ge 1 ]; then
fi
%preun
fi
%preun
-RUNLEVEL=`/sbin/runlevel`
-
# 0 = erase, 1 = upgrade
if [ $1 -eq 0 ]; then
#
# stop pl_sshd, remove it from rcX.d init dirs, remove link
# to sshd's pam config
#
# 0 = erase, 1 = upgrade
if [ $1 -eq 0 ]; then
#
# stop pl_sshd, remove it from rcX.d init dirs, remove link
# to sshd's pam config
#
- [ "$
RUNLEVEL" = "unknown
" ] || /etc/init.d/pl_sshd stop || :
+ [ "$
PL_BOOTCD" = "1
" ] || /etc/init.d/pl_sshd stop || :
chkconfig --del pl_sshd
rm -f /etc/pam.d/pl_sshd
chkconfig --del pl_sshd
rm -f /etc/pam.d/pl_sshd
@@
-111,7
+107,7
@@
if [ $1 -eq 0 ]; then
# things will operate normally i.e., without automount magic)
#
rm /etc/sysconfig/sshd
# things will operate normally i.e., without automount magic)
#
rm /etc/sysconfig/sshd
- if [ "$
RUNLEVEL" != "unknown
" ]; then
+ if [ "$
PL_BOOTCD" != "1
" ]; then
echo
echo "You need to manually restart sshd."
echo "Make sure you know what you're doing, particularly"
echo
echo "You need to manually restart sshd."
echo "Make sure you know what you're doing, particularly"
@@
-123,13
+119,13
@@
if [ $1 -eq 0 ]; then
# stop automounter, remove entry from auto.master, restart if
# necessary
#
# stop automounter, remove entry from auto.master, restart if
# necessary
#
- [ "$
RUNLEVEL" != "unknown
" ] && /etc/init.d/autofs stop
+ [ "$
PL_BOOTCD" != "1
" ] && /etc/init.d/autofs stop
auto_master=/etc/auto.master
mv $auto_master $auto_master.pl_sshd.preun
sed -e '\,^/var/pl_sshd/keys,d' $auto_master.pl_sshd.preun \
>$auto_master
auto_master=/etc/auto.master
mv $auto_master $auto_master.pl_sshd.preun
sed -e '\,^/var/pl_sshd/keys,d' $auto_master.pl_sshd.preun \
>$auto_master
- [ "$
RUNLEVEL" != "unknown
" ] && /etc/init.d/autofs start
+ [ "$
PL_BOOTCD" != "1
" ] && /etc/init.d/autofs start
fi
fi