Merge pull request #519 from masnax/misc

Fix UI overrides & post-migration script

Author: stgraber

internal/worker/scripts/add-udev-network-rules.sh

@@ -47,7 +47,7 @@ NETWORKMANAGER_DEVS=$(grep -P -h -o "(?<=interface-name\=).*" /etc/NetworkManage
 NET_INTERFACES_DEVS=$(grep -P -o "(?<=iface ).*(?= inet)" /etc/network/interfaces | sort | uniq | grep -v "^lo$")
 NET_SYSTEMD_DEVS=$(grep "^Name=" /etc/systemd/network/10-cloud-init-*.network | cut -d'=' -f2)
 # shellcheck disable=SC2046,SC3009
-NET_SCRIPTS_DEVS=$(basename -a $(find /etc/sysconfig/network{,-scripts}/ifcfg-* -exec grep -l '^ONBOOT=yes' {} +) | grep -P -o "(?<=ifcfg-).*" | sort | uniq | grep -v "lo$" | grep -v "\.bak$")
+NET_SCRIPTS_DEVS=$(basename -a $(find /etc/sysconfig/network{,-scripts}/ifcfg-* -exec grep -L '^ONBOOT="\?no' {} +) | grep -P -o "(?<=ifcfg-).*" | sort | uniq | grep -v "lo$" | grep -v "\.bak$")
 
 if   [ ${#NETPLAN_DEVS} -gt 0 ]; then
     echo "Processing netplan devs: [${NETPLAN_DEVS}]"

internal/worker/scripts/dracut-add-virtio-drivers.sh

@@ -40,7 +40,7 @@ else
 
   modules="$(echo "${modules}" |cut -d'"' -f1-2) virtio virtio_blk virtio_net virtio_pci\""
   sed -e "s/^INITRD_MODULES=.*/${modules}/" -i /etc/sysconfig/kernel
-  if ! mkinitrd -f ; then
+  if ! mkinitrd ; then
     echo "Fallback to explicit mkinitrd"
     for f in /lib/modules/* ; do
       version="$(basename "${f}")"

ui/src/components/InstanceOverrides.tsx

@@ -129,8 +129,11 @@ const InstanceOverrides: FC = () => {
         memory: memoryInBytes,
         cpus: values.cpus,
         config: values.config,
-        os_type: values.os_type,
-        distribution: values.distribution,
+        os_type: values.os_type != instance?.os_type ? values.os_type : "",
+        distribution:
+          values.distribution != instance?.distribution
+            ? values.distribution
+            : "",
         distribution_version: values.distribution_version,
         started_after_migration: values.started_after_migration == "true",
         stopped_after_migration: values.stopped_after_migration == "true",