diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2012-07-21 11:31:14 +0200 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2012-07-21 11:38:16 +0200 |
| commit | fd80d9e754ac9f7d40ed388a2e2f69fede5f1d4c (patch) | |
| tree | cc31432ff320ec1a490f2fbffaadc169cb2997d7 | |
| parent | cbf8d1e64cea889b5e28b52809a2a47ae3885bd5 (diff) | |
geniso: fix driver mapping
The ISO contains more specific drivers than expected for some
Windows versions. The document I based the initial implementation
on was likely outdated.
This was causing some files not to be copied from the source ISO
to the destination path.
| -rw-r--r-- | tools/geniso.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tools/geniso.c b/tools/geniso.c index 8a28630..a359640 100644 --- a/tools/geniso.c +++ b/tools/geniso.c @@ -88,43 +88,43 @@ static const VioDriverSet drivers[] = { }, [VIO_WINVER_WIN2003] = { [VIO_DRIVER_NETKVM] = { "XP/x86", "XP/amd64", "(netkvm.*|readme.doc)" }, - [VIO_DRIVER_SERIAL] = { "Wxp/x86", "Wnet/amd64", "(vioser.*|wdfcoinstaller.*.dll)" }, - [VIO_DRIVER_BALLOON] = { "Wxp/x86", "Wnet/amd64", "(balloon.*|bln.*|wdfcoinstaller.*.dll)" }, + [VIO_DRIVER_SERIAL] = { "Wnet/x86", "Wnet/amd64", "(vioser.*|wdfcoinstaller.*.dll)" }, + [VIO_DRIVER_BALLOON] = { "Wnet/x86", "Wnet/amd64", "(balloon.*|bln.*|wdfcoinstaller.*.dll)" }, [VIO_DRIVER_BLOCK] = { "Wnet/x86", "Wnet/amd64", "viostor.*" }, [VIO_DRIVER_SCSI] = { "Wnet/x86", "Wnet/amd64", "vioscsi.*" }, }, [VIO_WINVER_VISTA] = { [VIO_DRIVER_NETKVM] = { "Vista/x86", "Vista/amd64", "(netkvm.*|readme.doc)" }, - [VIO_DRIVER_SERIAL] = { "Wxp/x86", "Wnet/amd64", "(vioser.*|wdfcoinstaller.*.dll)" }, - [VIO_DRIVER_BALLOON] = { "Wxp/x86", "Wnet/amd64", "(balloon.*|bln.*|wdfcoinstaller.*.dll)" }, + [VIO_DRIVER_SERIAL] = { "Wlh/x86", "Wlh/amd64", "(vioser.*|wdfcoinstaller.*.dll)" }, + [VIO_DRIVER_BALLOON] = { "Wlh/x86", "Wlh/amd64", "(balloon.*|bln.*|wdfcoinstaller.*.dll)" }, [VIO_DRIVER_BLOCK] = { "Wlh/x86", "Wlh/amd64", "viostor.*" }, [VIO_DRIVER_SCSI] = { "Wlh/x86", "Wlh/amd64", "vioscsi.*" }, }, [VIO_WINVER_WIN7] = { [VIO_DRIVER_NETKVM] = { "Win7/x86", "Win7/amd64", "(netkvm.*|readme.doc)" }, - [VIO_DRIVER_SERIAL] = { "Wxp/x86", "Wnet/amd64", "(vioser.*|wdfcoinstaller.*.dll)" }, - [VIO_DRIVER_BALLOON] = { "Wxp/x86", "Wnet/amd64", "(balloon.*|bln.*|wdfcoinstaller.*.dll)" }, - [VIO_DRIVER_BLOCK] = { "Wlh/x86", "Wlh/amd64", "viostor.*" }, + [VIO_DRIVER_SERIAL] = { "Win7/x86", "Win7/amd64", "(vioser.*|wdfcoinstaller.*.dll)" }, + [VIO_DRIVER_BALLOON] = { "Win7/x86", "Win7/amd64", "(balloon.*|bln.*|wdfcoinstaller.*.dll)" }, + [VIO_DRIVER_BLOCK] = { "Win7/x86", "Win7/amd64", "viostor.*" }, [VIO_DRIVER_SCSI] = { "Win7/x86", "Win7/amd64", "vioscsi.*" }, }, [VIO_WINVER_WIN2008] = { [VIO_DRIVER_NETKVM] = { "Vista/x86", "Vista/amd64", "(netkvm.*|readme.doc)" }, - [VIO_DRIVER_SERIAL] = { "Wxp/x86", "Wnet/amd64", "(vioser.*|wdfcoinstaller.*.dll)" }, - [VIO_DRIVER_BALLOON] = { "Wxp/x86", "Wnet/amd64", "(balloon.*|bln.*|wdfcoinstaller.*.dll)" }, + [VIO_DRIVER_SERIAL] = { "Wlh/x86", "Wlh/amd64", "(vioser.*|wdfcoinstaller.*.dll)" }, + [VIO_DRIVER_BALLOON] = { "Wlh/x86", "Wlh/amd64", "(balloon.*|bln.*|wdfcoinstaller.*.dll)" }, [VIO_DRIVER_BLOCK] = { "Wlh/x86", "Wlh/amd64", "viostor.*" }, [VIO_DRIVER_SCSI] = { "Wlh/x86", "Wlh/amd64", "vioscsi.*" }, }, [VIO_WINVER_WIN2008R2] = { [VIO_DRIVER_NETKVM] = { "Win7/x86", "Win7/amd64", "(netkvm.*|readme.doc)" }, - [VIO_DRIVER_SERIAL] = { "Wxp/x86", "Wnet/amd64", "(vioser.*|wdfcoinstaller.*.dll)" }, - [VIO_DRIVER_BALLOON] = { "Wxp/x86", "Wnet/amd64", "(balloon.*|bln.*|wdfcoinstaller.*.dll)" }, + [VIO_DRIVER_SERIAL] = { "Win7/x86", "Win7/amd64", "(vioser.*|wdfcoinstaller.*.dll)" }, + [VIO_DRIVER_BALLOON] = { "Win7/x86", "Win7/amd64", "(balloon.*|bln.*|wdfcoinstaller.*.dll)" }, [VIO_DRIVER_BLOCK] = { "Wlh/x86", "Wlh/amd64", "viostor.*" }, [VIO_DRIVER_SCSI] = { "Win7/x86", "Win7/amd64", "vioscsi.*" }, }, [VIO_WINVER_WIN8] = { [VIO_DRIVER_NETKVM] = { "Win7/x86", "Win7/amd64", "(netkvm.*|readme.doc)" }, - [VIO_DRIVER_SERIAL] = { "Wxp/x86", "Wnet/amd64", "(vioser.*|wdfcoinstaller.*.dll)" }, - [VIO_DRIVER_BALLOON] = { "Wxp/x86", "Wnet/amd64", "(balloon.*|bln.*|wdfcoinstaller.*.dll)" }, + [VIO_DRIVER_SERIAL] = { "Win7/x86", "Win7/amd64", "(vioser.*|wdfcoinstaller.*.dll)" }, + [VIO_DRIVER_BALLOON] = { "Win7/x86", "Win7/amd64", "(balloon.*|bln.*|wdfcoinstaller.*.dll)" }, [VIO_DRIVER_BLOCK] = { "Wlh/x86", "Wlh/amd64", "viostor.*" }, [VIO_DRIVER_SCSI] = { "Win7/x86", "Win7/amd64", "vioscsi.*" }, } |