Fixes #12222: Warning when upgrading from 4.2 to 4.3: No such file or…

… directory
Normation · Mar 20, 2018 · 512157d · 512157d
1 parent 0fb1b74
commit 512157d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/rudder-agent/SOURCES/rudder-agent-postinst b/rudder-agent/SOURCES/rudder-agent-postinst
@@ -117,7 +117,6 @@ then
   then
     update-rc.d rudder remove
   fi
-  rm -f /etc/init.d/rudder
 fi
 
 # Delete all flag files
@@ -126,12 +125,8 @@ rm -f /var/rudder/tmp/migration-rudder-service-systemd
 rm -f /var/rudder/tmp/migration-rudder-service-enabled
 rm -f /var/rudder/tmp/migration-rudder-cf-serverd-disabled
 
-# remove ldso.conf if it was installed by a previous version (starting from 4.3)
-if [ -e /etc/ld.so.conf.d/rudder.conf ]
-then
-  rm /etc/ld.so.conf.d/rudder.conf
-  ldconfig
-fi
+# ldso.conf should be removed already if it was installed by a previous version (starting from 4.3)
+ldconfig
 
 # Set a "lock" to avoid CFEngine being restarted during the upgrade process
 I_SET_THE_LOCK=0

diff --git a/rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec b/rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec
@@ -204,11 +204,8 @@ fi
 # Post Installation
 #=================================================
 
-if [ -e /etc/ld.so.conf.d/rudder-inventory-ldap.conf ]
-then
-  rm /etc/ld.so.conf.d/rudder-inventory-ldap.conf
-  ldconfig
-fi
+# file /etc/ld.so.conf.d/rudder-inventory-ldap.conf has already been removed by rpm
+ldconfig
 
 echo -n "INFO: Setting rudder-slapd as a boot service..."
 chkconfig --add rudder-slapd >/dev/null 2>&1