Skip to content

Commit d3b5bc1

Browse files
aafeijoo-susejohannbg
authored andcommitted
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.
1 parent 0af11c5 commit d3b5bc1

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

modules.d/35network-wicked/module-setup.sh

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,23 @@ install() {
3333

3434
inst_dir /etc/wicked/extensions
3535
inst_dir /usr/share/wicked/schema
36-
inst_dir /usr/lib/wicked/bin
36+
if [ -d /usr/lib/wicked/bin ]; then
37+
inst_dir /usr/lib/wicked/bin
38+
inst_multiple "/usr/lib/wicked/bin/*"
39+
elif [ -d /usr/libexec/wicked/bin ]; then
40+
inst_dir /usr/libexec/wicked/bin
41+
inst_multiple "/usr/libexec/wicked/bin/*"
42+
fi
3743
inst_dir /var/lib/wicked
3844

3945
inst_multiple "/etc/wicked/*.xml"
4046
inst_multiple "/etc/wicked/extensions/*"
41-
inst_multiple "/etc/dbus-1/system.d/org.opensuse.Network*"
47+
if [ -f /etc/dbus-1/system.d/org.opensuse.Network.conf ]; then
48+
inst_multiple "/etc/dbus-1/system.d/org.opensuse.Network*"
49+
elif [ -f /usr/share/dbus-1/system.d/org.opensuse.Network.conf ]; then
50+
inst_multiple "/usr/share/dbus-1/system.d/org.opensuse.Network*"
51+
fi
4252
inst_multiple "/usr/share/wicked/schema/*"
43-
inst_multiple "/usr/lib/wicked/bin/*"
44-
inst_multiple "/usr/libexec/wicked/bin/*"
4553
inst_multiple "/usr/sbin/wicked*"
4654

4755
wicked_units=(

0 commit comments

Comments
 (0)