pmdinfo: check for pci.ids in /usr/share/misc
Checks
Commit Message
From: Luca Boccassi <luca.boccassi@microsoft.com>
Debian and Ubuntu switched years ago from /usr/share/hwdata to /usr/share/misc,
and the former is just a compat symlink now.
We are starting to get bug reports to nudge us into changing.
So check the new path first, and the old one as a fallback.
Cc: stable@dpdk.org
Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
---
usertools/dpdk-pmdinfo.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Comments
On Thu, Mar 12, 2020 at 5:30 PM <luca.boccassi@gmail.com> wrote:
>
> From: Luca Boccassi <luca.boccassi@microsoft.com>
>
> Debian and Ubuntu switched years ago from /usr/share/hwdata to /usr/share/misc,
> and the former is just a compat symlink now.
> We are starting to get bug reports to nudge us into changing.
> So check the new path first, and the old one as a fallback.
>
> Cc: stable@dpdk.org
>
> Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
> ---
> usertools/dpdk-pmdinfo.py | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/usertools/dpdk-pmdinfo.py b/usertools/dpdk-pmdinfo.py
> index 9d5c6369a0..12f20735e0 100755
> --- a/usertools/dpdk-pmdinfo.py
> +++ b/usertools/dpdk-pmdinfo.py
> @@ -561,7 +561,10 @@ def main(stream=None):
>
> pcifile_default = "./pci.ids" # For unknown OS's assume local file
> if platform.system() == 'Linux':
> - pcifile_default = "/usr/share/hwdata/pci.ids"
> + # hwdata is the legacy location, misc is supported going forward
> + pcifile_default = "/usr/share/misc/pci.ids"
> + if not os.path.exists(pcifile_default):
> + pcifile_default = "/usr/share/hwdata/pci.ids"
> elif platform.system() == 'FreeBSD':
> pcifile_default = "/usr/local/share/pciids/pci.ids"
> if not os.path.exists(pcifile_default):
> --
> 2.20.1
>
LGTM.
Acked-by: David Marchand <david.marchand@redhat.com>
On Thu, Mar 12, 2020 at 5:30 PM <luca.boccassi@gmail.com> wrote:
>
> From: Luca Boccassi <luca.boccassi@microsoft.com>
>
> Debian and Ubuntu switched years ago from /usr/share/hwdata to /usr/share/misc,
> and the former is just a compat symlink now.
> We are starting to get bug reports to nudge us into changing.
> So check the new path first, and the old one as a fallback.
>
> Cc: stable@dpdk.org
>
> Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
Acked-by: David Marchand <david.marchand@redhat.com>
Applied, thanks.
@@ -561,7 +561,10 @@ def main(stream=None):
pcifile_default = "./pci.ids" # For unknown OS's assume local file
if platform.system() == 'Linux':
- pcifile_default = "/usr/share/hwdata/pci.ids"
+ # hwdata is the legacy location, misc is supported going forward
+ pcifile_default = "/usr/share/misc/pci.ids"
+ if not os.path.exists(pcifile_default):
+ pcifile_default = "/usr/share/hwdata/pci.ids"
elif platform.system() == 'FreeBSD':
pcifile_default = "/usr/local/share/pciids/pci.ids"
if not os.path.exists(pcifile_default):