diff --git a/0040-Fix-colloecting-virtio-nic-info-error.patch b/0040-Fix-colloecting-virtio-nic-info-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..1d571029228ac1530dec3c1fe5860daf04de1ee4 --- /dev/null +++ b/0040-Fix-colloecting-virtio-nic-info-error.patch @@ -0,0 +1,13 @@ +diff -aurN leapp-repository-0.13.0/repos/system_upgrade/el7toel8/libraries/persistentnetnames.py leapp-repository-0.13.0-new/repos/system_upgrade/el7toel8/libraries/persistentnetnames.py +--- leapp-repository-0.13.0/repos/system_upgrade/el7toel8/libraries/persistentnetnames.py 2021-02-05 03:24:17.000000000 +0800 ++++ leapp-repository-0.13.0-new/repos/system_upgrade/el7toel8/libraries/persistentnetnames.py 2023-03-25 11:31:49.038000000 +0800 +@@ -20,6 +20,9 @@ + """ + pci = {} + ++ if path.startswith('virtio-pci-'): ++ path = path[7:] ++ + # TODO(msekleta): check that path argument actually has ID_PATH format + if path.startswith('pci-'): + components = path[4:16].split(':') diff --git a/leapp-repository.spec b/leapp-repository.spec index e094cc79e76bb3feebe2a97f7e605503843ea4a8..9f0ee89efec59a0a28b2462f39d9a3856b089436 100644 --- a/leapp-repository.spec +++ b/leapp-repository.spec @@ -11,7 +11,7 @@ }\ py2_byte_compile "%1" "%2"} -%define anolis_release 18 +%define anolis_release 19 Name: leapp-repository Version: 0.13.0 @@ -65,6 +65,7 @@ Patch36: 0036-Perform-system-requirements-check-to-ensure-migratio.patch Patch37: 0037-Add-RPMDownloadOrInstallError-and-its-exit-code.patch Patch38: 0038-Provides-more-information-for-debug-purpose-when-exc.patch Patch39: 0039-Add-grub2-tools-update-into-answerfile.patch +Patch40: 0040-Fix-colloecting-virtio-nic-info-error.patch BuildArch: noarch BuildRequires: python-devel @@ -193,6 +194,9 @@ done; # no files here %changelog +* Sat Mar 25 2023 guo chuang - 0.13.0-2.19 +- Fixed the issue that collecting virtio type NIC information failed from the centos 7.4 + * Mon Mar 7 2023 Bitao Hu - 0.13.0-2.18 - Add grub2-tools update into answerfile. - Comment patch 0025 out since openssl11-compat fixed it