Skip to content

Commit

Permalink
RHEL-706 related fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Vadim Rozenfeld <[email protected]>
  • Loading branch information
vrozenfe committed Nov 7, 2023
1 parent db51f3b commit 943dab8
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions data/virtio-win-pre-installable-drivers-win-10.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<file>netkvm.cat</file>
<file>netkvm.inf</file>
<file>netkvm.sys</file>
<file>netkvmco.dll</file>
<file>netkvmco.exe</file>
<device id="http://pcisig.com/pci/1af4/1000"/>
<device id="http://pcisig.com/pci/1af4/1041"/>

Expand Down Expand Up @@ -109,7 +109,7 @@
<file>netkvm.cat</file>
<file>netkvm.inf</file>
<file>netkvm.sys</file>
<file>netkvmco.dll</file>
<file>netkvmco.exe</file>
<device id="http://pcisig.com/pci/1af4/1000"/>
<device id="http://pcisig.com/pci/1af4/1041"/>

Expand Down
2 changes: 1 addition & 1 deletion data/virtio-win-pre-installable-drivers-win-11.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<file>netkvm.cat</file>
<file>netkvm.inf</file>
<file>netkvm.sys</file>
<file>netkvmco.dll</file>
<file>netkvmco.exe</file>
<device id="http://pcisig.com/pci/1af4/1000"/>
<device id="http://pcisig.com/pci/1af4/1041"/>

Expand Down
4 changes: 2 additions & 2 deletions data/virtio-win-pre-installable-drivers-win-8.1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<file>netkvm.cat</file>
<file>netkvm.inf</file>
<file>netkvm.sys</file>
<file>netkvmco.dll</file>
<file>netkvmco.exe</file>
<device id="http://pcisig.com/pci/1af4/1000"/>
<device id="http://pcisig.com/pci/1af4/1041"/>

Expand Down Expand Up @@ -109,7 +109,7 @@
<file>netkvm.cat</file>
<file>netkvm.inf</file>
<file>netkvm.sys</file>
<file>netkvmco.dll</file>
<file>netkvmco.exe</file>
<device id="http://pcisig.com/pci/1af4/1000"/>
<device id="http://pcisig.com/pci/1af4/1041"/>

Expand Down
4 changes: 2 additions & 2 deletions data/virtio-win-pre-installable-drivers-win-8.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<file>netkvm.cat</file>
<file>netkvm.inf</file>
<file>netkvm.sys</file>
<file>netkvmco.dll</file>
<file>netkvmco.exe</file>
<device id="http://pcisig.com/pci/1af4/1000"/>
<device id="http://pcisig.com/pci/1af4/1041"/>

Expand Down Expand Up @@ -111,7 +111,7 @@
<file>netkvm.cat</file>
<file>netkvm.inf</file>
<file>netkvm.sys</file>
<file>netkvmco.dll</file>
<file>netkvmco.exe</file>
<device id="http://pcisig.com/pci/1af4/1000"/>
<device id="http://pcisig.com/pci/1af4/1041"/>

Expand Down
4 changes: 2 additions & 2 deletions make-virtio-win-rpm-archive.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,11 @@ def build_vfd(fname, dmap, driverdir, rootdir, rpmdriversdir, mediadir):
# used in any automatic fashion, so just putting them on the
# .iso is sufficient
# * .doc doesn't serve any purpose on the .vfd
# * netkvmco.dll is an end user configuration tool for, as
# * netkvmco.exe is an end user configuration tool for, as
# such doesn't have much use at boot/install time
if (src_file.endswith('.pdb') or
src_file.endswith('.doc') or
src_file == 'netkvmco.dll'):
src_file == 'netkvmco.exe'):
continue

shutil.copy2(os.path.join(src, src_file), dest_vfd)
Expand Down
2 changes: 1 addition & 1 deletion util/filemap.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"netkvmco.pdb", "readme.doc"]
FILELISTS['NetKVM:2k8R2'] = FILELISTS['NetKVM:xp'][:] + ["netkvmco.dll",
"netkvmco.pdb", "readme.doc"]
FILELISTS['NetKVM'] = FILELISTS['NetKVM:xp'][:] + ["netkvmco.dll",
FILELISTS['NetKVM'] = FILELISTS['NetKVM:xp'][:] + ["netkvmco.exe",
"netkvmco.pdb", "Readme.md"]

_pvpanicfiles = [
Expand Down

0 comments on commit 943dab8

Please sign in to comment.