From d3b5bc17ebadfe8922d1144b3dfd5435d0ecc71a Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Fri, 10 Dec 2021 14:48:39 +0100 Subject: [PATCH] fix(network-wicked): multiple path corrections Since wicked-0.6.67, its dbus configuration files can be installed in /etc or /usr/share. Also, check if it's using libexec or lib instead of displaying always an error. --- modules.d/35network-wicked/module-setup.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/modules.d/35network-wicked/module-setup.sh b/modules.d/35network-wicked/module-setup.sh index 5325a23d21..990355c99a 100755 --- a/modules.d/35network-wicked/module-setup.sh +++ b/modules.d/35network-wicked/module-setup.sh @@ -33,15 +33,23 @@ install() { inst_dir /etc/wicked/extensions inst_dir /usr/share/wicked/schema - inst_dir /usr/lib/wicked/bin + if [ -d /usr/lib/wicked/bin ]; then + inst_dir /usr/lib/wicked/bin + inst_multiple "/usr/lib/wicked/bin/*" + elif [ -d /usr/libexec/wicked/bin ]; then + inst_dir /usr/libexec/wicked/bin + inst_multiple "/usr/libexec/wicked/bin/*" + fi inst_dir /var/lib/wicked inst_multiple "/etc/wicked/*.xml" inst_multiple "/etc/wicked/extensions/*" - inst_multiple "/etc/dbus-1/system.d/org.opensuse.Network*" + if [ -f /etc/dbus-1/system.d/org.opensuse.Network.conf ]; then + inst_multiple "/etc/dbus-1/system.d/org.opensuse.Network*" + elif [ -f /usr/share/dbus-1/system.d/org.opensuse.Network.conf ]; then + inst_multiple "/usr/share/dbus-1/system.d/org.opensuse.Network*" + fi inst_multiple "/usr/share/wicked/schema/*" - inst_multiple "/usr/lib/wicked/bin/*" - inst_multiple "/usr/libexec/wicked/bin/*" inst_multiple "/usr/sbin/wicked*" wicked_units=(