rpms
/
puppet
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RHBZ#1070395 - fixed error in postun scriplet

Browse Source
epel9
Lukas Zapletal 11 years ago
parent 3925895740
commit 28934567ac
1 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File

79
puppet.spec
Unescape View File

@ -18,7 +18,7 @@
Name: puppet Name: puppet
Version: 3.4.3 Version: 3.4.3
Release: 2%{?dist} Release: 3%{?dist}
Summary: A network tool for managing many disparate systems Summary: A network tool for managing many disparate systems
License: ASL 2.0 License: ASL 2.0
URL: http://puppetlabs.com URL: http://puppetlabs.com
@ -287,7 +287,7 @@ exit 0
%post %post
%if 0%{?_with_systemd} %if 0%{?_with_systemd}
/bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1
%else %else
# If there's a running puppet agent, restart it during upgrade. Fixes # If there's a running puppet agent, restart it during upgrade. Fixes
# BZ #1024538. # BZ #1024538.
@ -296,95 +296,100 @@ if [ "$1" -ge 1 ]; then
if [ -e "$pid" ]; then if [ -e "$pid" ]; then
if ps aux | grep `cat "$pid"` | grep -v grep | awk '{ print $12 }' | grep -q sbin; then if ps aux | grep `cat "$pid"` | grep -v grep | awk '{ print $12 }' | grep -q sbin; then
(kill $(< "$pid") && rm -f "$pid" && \ (kill $(< "$pid") && rm -f "$pid" && \
/sbin/service puppet start) >/dev/null 2>&1 || : /sbin/service puppet start) >/dev/null 2>&1
fi fi
fi fi
fi fi
/sbin/chkconfig --add puppet || : /sbin/chkconfig --add puppet
%endif %endif
exit 0
%post server %post server
%if 0%{?_with_systemd} %if 0%{?_with_systemd}
/bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1
%else %else
/sbin/chkconfig --add puppetmaster || : /sbin/chkconfig --add puppetmaster
%endif %endif
exit 0
%preun %preun
%if 0%{?_with_systemd} %if 0%{?_with_systemd}
if [ "$1" -eq 0 ] ; then if [ "$1" -eq 0 ] ; then
/bin/systemctl --no-reload disable puppet.service > /dev/null 2>&1 || : /bin/systemctl --no-reload disable puppet.service > /dev/null 2>&1
/bin/systemctl stop puppet.service > /dev/null 2>&1 || : /bin/systemctl stop puppet.service > /dev/null 2>&1
/bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1
fi fi
if [ "$1" == "1" ]; then if [ "$1" -eq 1 ]; then
/bin/systemctl is-enabled puppetagent.service > /dev/null 2>&1 /bin/systemctl is-enabled puppetagent.service > /dev/null 2>&1
if [ "$?" == "0" ]; then if [ "$?" -eq 0 ]; then
/bin/systemctl /bin/systemctl --no-reload disable puppetagent.service > /dev/null 2>&1 ||: /bin/systemctl /bin/systemctl --no-reload disable puppetagent.service > /dev/null 2>&1
/bin/systemctl stop puppetagent.service > /dev/null 2>&1 ||: /bin/systemctl stop puppetagent.service > /dev/null 2>&1
/bin/systemctl daemon-reload >/dev/null 2>&1 ||: /bin/systemctl daemon-reload >/dev/null 2>&1
if [ ! -e %{pending_upgrade_file} ]; then install -D -m 644 /dev/null %{pending_upgrade_file} > /dev/null 2>&1
if [ ! -d %{pending_upgrade_path} ]; then
mkdir %{pending_upgrade_path}
end
touch %{pending_upgrade_file}
fi
fi fi
fi fi
%else %else
if [ "$1" = 0 ] ; then if [ "$1" -eq 0 ] ; then
/sbin/service puppet stop >/dev/null 2>&1 /sbin/service puppet stop >/dev/null 2>&1
/sbin/chkconfig --del puppet || : /sbin/chkconfig --del puppet
fi fi
%endif %endif
exit 0
%preun server %preun server
%if 0%{?_with_systemd} %if 0%{?_with_systemd}
if [ $1 -eq 0 ] ; then if [ "$1" -eq 0 ] ; then
/bin/systemctl --no-reload disable puppetmaster.service > /dev/null 2>&1 || : /bin/systemctl --no-reload disable puppetmaster.service > /dev/null 2>&1
/bin/systemctl stop puppetmaster.service > /dev/null 2>&1 || : /bin/systemctl stop puppetmaster.service > /dev/null 2>&1
/bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1
fi fi
%else %else
if [ "$1" = 0 ] ; then if [ "$1" -eq 0 ] ; then
/sbin/service puppetmaster stop >/dev/null 2>&1 /sbin/service puppetmaster stop >/dev/null 2>&1
/sbin/chkconfig --del puppetmaster || : /sbin/chkconfig --del puppetmaster
fi fi
%endif %endif
exit 0
%postun %postun
%if 0%{?_with_systemd} %if 0%{?_with_systemd}
if [ $1 -ge 1 ] ; then if [ "$1" -ge 1 ] ; then
/bin/systemctl try-restart puppet.service >/dev/null 2>&1 || : /bin/systemctl try-restart puppet.service >/dev/null 2>&1
if [ -e %{pending_upgrade_file} ]; then if [ -e %{pending_upgrade_file} ]; then
/bin/systemctl --no-reload enable puppet.service > /dev/null 2>&1 ||: /bin/systemctl --no-reload enable puppet.service > /dev/null 2>&1
/bin/systemctl start puppet.service > /dev/null 2>&1 ||: /bin/systemctl start puppet.service > /dev/null 2>&1
/bin/systemctl daemon-reload >/dev/null 2>&1 ||: /bin/systemctl daemon-reload >/dev/null 2>&1
rm %{pending_upgrade_file} rm %{pending_upgrade_file}
fi fi
fi fi
%else %else
if [ "$1" -ge 1 ]; then if [ "$1" -ge 1 ]; then
/sbin/service puppet condrestart >/dev/null 2>&1 || : /sbin/service puppet condrestart >/dev/null 2>&1
fi fi
%endif %endif
exit 0
%postun server %postun server
%if 0%{?_with_systemd} %if 0%{?_with_systemd}
if [ $1 -ge 1 ] ; then if [ "$1" -ge 1 ] ; then
/bin/systemctl try-restart puppetmaster.service >/dev/null 2>&1 || : /bin/systemctl try-restart puppetmaster.service >/dev/null 2>&1
fi fi
%else %else
if [ "$1" -ge 1 ]; then if [ "$1" -ge 1 ]; then
/sbin/service puppetmaster condrestart >/dev/null 2>&1 || : /sbin/service puppetmaster condrestart >/dev/null 2>&1
fi fi
%endif %endif
exit 0
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
%changelog %changelog
* Tue Apr 08 2014 Lukas Zapletal <lzap+rpm@redhat.com> 3.4.3-3
- RHBZ#1070395 - fixed error in postun scriplet
- Reformatted all scriplets and corrected exit codes
* Tue Apr 08 2014 Lukas Zapletal <lzap+rpm@redhat.com> 3.4.3-2 * Tue Apr 08 2014 Lukas Zapletal <lzap+rpm@redhat.com> 3.4.3-2
- Fixed systemd unit files - wrappers are now in use and master starts - Fixed systemd unit files - wrappers are now in use and master starts
with correct context with correct context

Write Preview
Loading…
Cancel
Save