From 55f71b025555d9cb6d7aebf545243602c74a7557 Mon Sep 17 00:00:00 2001 From: Thomas Florio Date: Thu, 27 Jun 2024 17:24:52 +0200 Subject: [PATCH] More usage of absolute paths in salt scripts --- .../susemanager-sls/salt/bootloader/autoinstall.sls | 6 +++--- susemanager-utils/susemanager-sls/salt/bootstrap/init.sls | 4 ++-- susemanager-utils/susemanager-sls/salt/channels/init.sls | 2 +- .../susemanager-sls/salt/images/kiwi-image-build.sls | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/susemanager-utils/susemanager-sls/salt/bootloader/autoinstall.sls b/susemanager-utils/susemanager-sls/salt/bootloader/autoinstall.sls index 57c68223ad20..63208933fc9b 100644 --- a/susemanager-utils/susemanager-sls/salt/bootloader/autoinstall.sls +++ b/susemanager-utils/susemanager-sls/salt/bootloader/autoinstall.sls @@ -11,8 +11,8 @@ mgr_copy_initrd: {% set loader_type = salt['cmd.run']('if [ -f /etc/sysconfig/bootloader ]; then source /etc/sysconfig/bootloader 2> /dev/null; fi; if [ -z "${LOADER_TYPE}" ]; then -if [ $(which grubonce 2> /dev/null) ] && [ !$(which grub2-mkconfig 2> /dev/null) ]; then LOADER_TYPE="grub"; -elif [ $(which elilo 2> /dev/null) ] && [ !$(which grub2-mkconfig 2> /dev/null) ]; then LOADER_TYPE="elilo"; +if [ $(/usr/bin/which grubonce 2> /dev/null) ] && [ !$(/usr/bin/which grub2-mkconfig 2> /dev/null) ]; then LOADER_TYPE="grub"; +elif [ $(/usr/bin/which elilo 2> /dev/null) ] && [ !$(/usr/bin/which grub2-mkconfig 2> /dev/null) ]; then LOADER_TYPE="elilo"; fi; fi; echo "${LOADER_TYPE}"', python_shell=True) %} {% if loader_type == 'grub' %} @@ -27,7 +27,7 @@ mgr_create_grub_entry: mgr_grub_boot_once: cmd.run: - - name: grubonce "{{ pillar.get('uyuni-reinstall-name') }}" + - name: /usr/sbin/grubonce "{{ pillar.get('uyuni-reinstall-name') }}" - onchanges: - file: mgr_create_grub_entry {% elif loader_type == 'elilo' %} diff --git a/susemanager-utils/susemanager-sls/salt/bootstrap/init.sls b/susemanager-utils/susemanager-sls/salt/bootstrap/init.sls index 022b490823fc..6c0298d9851a 100644 --- a/susemanager-utils/susemanager-sls/salt/bootstrap/init.sls +++ b/susemanager-utils/susemanager-sls/salt/bootstrap/init.sls @@ -192,10 +192,10 @@ salt-minion-package: {# hack until transactional_update.run is fixed to use venv-salt-call #} {# Writing to the future - find latest etc overlay which was created for package installation and use that as etc root #} {# this only works here in bootstrap when we are not running in transaction #} -{%- set pending_transaction_id = salt['cmd.run']('snapper --no-dbus list --columns=number | grep "+" | tr -d "+"', python_shell=True) %} +{%- set pending_transaction_id = salt['cmd.run']('/usr/bin/snapper --no-dbus list --columns=number | /usr/bin/grep "+" | tr -d "+"', python_shell=True) %} {%- if not pending_transaction_id %} {# if we did not get pending transaction id, write to current upperdir #} -{%- set pending_transaction_id = salt['cmd.run']('snapper --no-dbus list --columns number | grep "*" | tr -d "*"', python_shell=True) %} +{%- set pending_transaction_id = salt['cmd.run']('/usr/bin/snapper --no-dbus list --columns number | /usr/bin/grep "*" | tr -d "*"', python_shell=True) %} {%- endif %} {# increase transaction id by 1 since jinja is doing this before new transaction for package install is created #} {# this is working under assumption there will be only one transaction between jinja render and actual package installation #} diff --git a/susemanager-utils/susemanager-sls/salt/channels/init.sls b/susemanager-utils/susemanager-sls/salt/channels/init.sls index 1db77c8472cd..b6aac50eba1b 100644 --- a/susemanager-utils/susemanager-sls/salt/channels/init.sls +++ b/susemanager-utils/susemanager-sls/salt/channels/init.sls @@ -16,7 +16,7 @@ include: {%- set is_dnf = salt['pkg.version']("dnf") %} {%- if is_dnf %} -{%- set dnf_plugins = salt['cmd.run']("find /usr/lib -type d -name dnf-plugins -printf '%T@ %p\n' | sort -nr | cut -d ' ' -s -f 2- | head -n 1", python_shell=True) %} +{%- set dnf_plugins = salt['cmd.run']("/usr/bin/find /usr/lib -type d -name dnf-plugins -printf '%T@ %p\n' | /usr/bin/sort -nr | /usr/bin/cut -d ' ' -s -f 2- | /usr/bin/head -n 1", python_shell=True) %} {%- if dnf_plugins %} mgrchannels_susemanagerplugin_dnf: file.managed: diff --git a/susemanager-utils/susemanager-sls/salt/images/kiwi-image-build.sls b/susemanager-utils/susemanager-sls/salt/images/kiwi-image-build.sls index 765d3c235c12..e930928a0cf2 100644 --- a/susemanager-utils/susemanager-sls/salt/images/kiwi-image-build.sls +++ b/susemanager-utils/susemanager-sls/salt/images/kiwi-image-build.sls @@ -86,7 +86,7 @@ mgr_buildimage_kiwi_bundle: # KIWI Legacy # -{%- set kiwi_help = salt['cmd.run']('kiwi --help') %} +{%- set kiwi_help = salt['cmd.run']('/usr/bin/kiwi --help') %} {%- set have_bundle_build = kiwi_help.find('--bundle-build') > 0 %} # i586 build on x86_64 host must be called with linux32 @@ -141,13 +141,13 @@ mgr_buildimage_kiwi_bundle_dir: mgr_buildimage_kiwi_bundle_tarball: cmd.run: - - name: "cd '{{ dest_dir }}' && tar czf '{{ bundle_dir }}'`basename *.packages .packages`-{{ bundle_id }}.tgz --no-recursion `find . -maxdepth 1 -type f`" + - name: "cd '{{ dest_dir }}' && /usr/bin/tar czf '{{ bundle_dir }}'`basename *.packages .packages`-{{ bundle_id }}.tgz --no-recursion `/usr/bin/find . -maxdepth 1 -type f`" - require: - file: mgr_buildimage_kiwi_bundle_dir mgr_buildimage_kiwi_bundle: cmd.run: - - name: "cd '{{ bundle_dir }}' && sha256sum *.tgz > `echo *.tgz`.sha256" + - name: "cd '{{ bundle_dir }}' && /usr/bin/sha256sum *.tgz > `/usr/bin/echo *.tgz`.sha256" - require: - cmd: mgr_buildimage_kiwi_bundle_tarball