spec: migrate client-redfish.xml to client-firmware.xml

openSUSE · Jan 25, 2023 · fb0fc89 · fb0fc89
1 parent 43f5d63
commit fb0fc89
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/etc/client.xml.in b/etc/client.xml.in
@@ -21,12 +21,6 @@
     <script name="ibft" command="@wicked_extensionsdir@/ibft" />
   </netif-firmware-discovery>
 
-  <!-- The client-redfish.xml is added by `wicked redfish enable`
-       to enable the `firmware:redfish` config extension script
-       in the netif-firmware-discovery set.
-    -->
-  <include name="client-redfish.xml" optional="true" />
-
   <!-- This specifies sources of network interface configurations.
 
        The ifconfig source specifies the type, location and the

diff --git a/wicked.spec.in b/wicked.spec.in
@@ -309,6 +309,13 @@ fi
 %{fillup_only -dns dhcp wicked network}
 # reload dbus after install or upgrade to apply new policies
 /usr/bin/systemctl reload dbus.service 2>/dev/null || :
+# migrate `wicked redfish enable` to `wicked firmware enable`
+if test -f %_sysconfdir/wicked/client-redfish.xml -a \
+      ! -f %_sysconfdir/wicked/client-firmware.xml ; then
+	mv -f -- %_sysconfdir/wicked/client-redfish.xml \
+		 %_sysconfdir/wicked/client-firmware.xml || :
+fi
+rm -f -- %_sysconfdir/wicked/client-redfish.xml || :
 
 %postun
 /sbin/ldconfig