Fixes #15567: rudder-pkg command in /opt/rudder/bin should not be cre…

…ated in postinst but at build time
Normation · Aug 23, 2019 · e485a28 · e485a28
1 parent 4071899
commit e485a28
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/relay/sources/Makefile b/relay/sources/Makefile
@@ -134,6 +134,7 @@ install: build
 
 	# rudder packaging
 	install -m 755 rudder-pkg/rudder-pkg $(DESTDIR)/opt/rudder/share/commands/package
+	ln -ns $(DESTDIR)/opt/rudder/share/commands/package $(DESTDIR)/opt/rudder/bin/rudder-pkg
 	install -m 755 rudder-pkg/rudder-pkg.conf $(DESTDIR)/opt/rudder/etc/rudder-pkg/rudder-pkg.conf
 	install -m 755 rudder-pkg/rudder_plugins_key.pub $(DESTDIR)/opt/rudder/etc/rudder-pkg/rudder_plugins_key.pub
 	install -m 644 autocomplete/rudder-pkg.sh $(DESTDIR)/etc/bash_completion.d/

diff --git a/relay/sources/rudder-server-relay-postinst b/relay/sources/rudder-server-relay-postinst
@@ -45,9 +45,6 @@ systemctl stop "${APACHE}" >> ${LOG_FILE} || true
 systemctl stop rudder-relayd >> ${LOG_FILE} || true
 echo " Done"
 
-# link rudder package to its old path
-ln -s /opt/rudder/share/commands/package /opt/rudder/bin/rudder-pkg
-
 # share directory with rudder-policy-reader
 chgrp -R rudder-policy-reader /var/rudder/share
 chmod 750 /var/rudder/share