Skip to content

Commit

Permalink
fix(network-wicked): multiple path corrections
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
aafeijoo-suse authored and johannbg committed Dec 11, 2021
1 parent 0af11c5 commit d3b5bc1
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions modules.d/35network-wicked/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down

0 comments on commit d3b5bc1

Please sign in to comment.