Skip to content

Commit

Permalink
Merge pull request Normation#626 from Kegeruneku/bug_6364/int/6364_do…
Browse files Browse the repository at this point in the history
…_not_run_ldconfig_on_aix_and_remove_things_properly

Fixes #6364: Remove things properly on AIX rudder-agent and do not try t...
  • Loading branch information
peckpeck committed Mar 5, 2015
2 parents 51de974 + db034f8 commit e61ed7e
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions rudder-agent/SPECS/rudder-agent.spec
Original file line number Diff line number Diff line change
Expand Up @@ -387,12 +387,16 @@ then
fi

# Reload configuration of ldd if new configuration has been added
%if "%{?_os}" != "aix"

%if "%{is_tokyocabinet_here}" != "true" && 0%{?rhel} != 3
if [ -f /etc/ld.so.conf.d/rudder.conf ]; then
ldconfig
fi
%endif

%endif

# Reload configuration of ldd if new configuration has been added,
# CentOS 3 style.
%if "%{is_tokyocabinet_here}" != "true" && 0%{?rhel} == 3
Expand Down Expand Up @@ -593,6 +597,10 @@ if [ $1 -eq 0 ]; then
# Make sure that Rudder agent specific files have been removed
rm -f /etc/init.d/rudder-agent
rm -f /etc/default/rudder-agent
%else
# Remove the AIX inittab entry and subsystem definition
rmssys -s rudder-agent
rmitab rudder-agent
%endif

# Remove UUID in any case
Expand Down

0 comments on commit e61ed7e

Please sign in to comment.