From 3ff282fb712340beb5d0e467b3d01b00c564e2cf Mon Sep 17 00:00:00 2001
From: Antony Messerli <antony@mes.ser.li>
Date: Sun, 5 Jan 2020 21:11:47 -0600
Subject: [PATCH] Adding generated pciids file

Adding static script from netbootxyz/pciids which is updated
and generated weekly
---
 roles/netbootxyz/defaults/main.yml         |  3 +--
 roles/netbootxyz/files/pciids_gen          | 26 ---------------------
 roles/netbootxyz/tasks/generate_menus.yml  |  7 +++++-
 roles/netbootxyz/tasks/generate_pciids.yml | 27 ----------------------
 roles/netbootxyz/tasks/main.yml            |  4 ----
 5 files changed, 7 insertions(+), 60 deletions(-)
 delete mode 100755 roles/netbootxyz/files/pciids_gen
 delete mode 100644 roles/netbootxyz/tasks/generate_pciids.yml

diff --git a/roles/netbootxyz/defaults/main.yml b/roles/netbootxyz/defaults/main.yml
index 6a8500a2..95d42f9e 100644
--- a/roles/netbootxyz/defaults/main.yml
+++ b/roles/netbootxyz/defaults/main.yml
@@ -36,8 +36,7 @@ generate_checksums: true
 checksums_filename: "{{ site_name }}-sha256-checksums.txt"
 
 # pciids
-generate_pciids: true
-pciids_url: https://raw.githubusercontent.com/pciutils/pciids/master/pci.ids
+pciids_url: https://raw.githubusercontent.com/netbootxyz/pciids/master/pciids.ipxe
 
 # bootloader options
 generate_disks: true
diff --git a/roles/netbootxyz/files/pciids_gen b/roles/netbootxyz/files/pciids_gen
deleted file mode 100755
index 4dae058f..00000000
--- a/roles/netbootxyz/files/pciids_gen
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-# Used for processing pci.ids into ipxe format
-# https://raw.githubusercontent.com/pciutils/pciids/master/pci.ids
-
-if [[ ! -n "$1" || ! -n "$2" ]]; then
-  echo "Please set PCIIDS file location and PCIIDS output file location..."
-  echo "pciids_gen pci.ids pciids.ipxe"
-  exit 1
-fi
-
-PCIIDS_FILE=$1
-PCIIDS_IPXE=$2
-
-awk ' \
-  BEGIN { \
-    print "#!ipxe\ngoto ${vendor}${device} || goto ${vendor} || exit" \
-  } \
-  /^[0-9a-f]{4}/ { \
-    vendor=substr($1,1,4); \
-    printf ":%s\nset ven %s\nexit\n", vendor, substr($0,7) \
-  } \
-  /^\t[0-9a-f]{4}/ { \
-    printf ":%s%s\nset dev %s\ngoto %s\n", \
-    vendor, substr($0, 2, 4), substr($0, 8), vendor \
-  } \
-' ${PCIIDS_FILE} > ${PCIIDS_IPXE}
diff --git a/roles/netbootxyz/tasks/generate_menus.yml b/roles/netbootxyz/tasks/generate_menus.yml
index ada72926..78cb7dac 100644
--- a/roles/netbootxyz/tasks/generate_menus.yml
+++ b/roles/netbootxyz/tasks/generate_menus.yml
@@ -52,4 +52,9 @@
     with_filetree: "templates/menu/"
     when: item.state == "file"
     tags:
-    - skip_ansible_lint
\ No newline at end of file
+    - skip_ansible_lint
+
+  - name: Retrieve pciids.ipxe
+    get_url:
+      url: "{{ pciids_url }}"
+      dest: "{{ netbootxyz_root }}/pciids.ipxe"
diff --git a/roles/netbootxyz/tasks/generate_pciids.yml b/roles/netbootxyz/tasks/generate_pciids.yml
deleted file mode 100644
index 8f63f137..00000000
--- a/roles/netbootxyz/tasks/generate_pciids.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-  - name: Retrieve pci.ids
-    get_url:
-      url: "{{ pciids_url }}"
-      dest: "{{ netbootxyz_root }}/pci.ids"
-
-  - name: Copy pciids_gen script to source dir
-    copy:
-      src: pciids_gen
-      dest: "{{ netbootxyz_root }}/pciids_gen"
-      mode: 0744
-
-  - name: Convert pci.ids to pciids.ipxe
-    shell: |
-      ./pciids_gen pci.ids pciids.ipxe
-    args:
-      chdir: "{{ netbootxyz_root }}"
-    tags:
-    - skip_ansible_lint
-
-  - name: Cleanup of files no longer needed
-    file:
-      path: "{{ item }}"
-      state: absent
-    with_items:
-      - "{{ netbootxyz_root }}/pciids_gen"
-      - "{{ netbootxyz_root }}/pci.ids"
diff --git a/roles/netbootxyz/tasks/main.yml b/roles/netbootxyz/tasks/main.yml
index be6a6695..ab9503d3 100644
--- a/roles/netbootxyz/tasks/main.yml
+++ b/roles/netbootxyz/tasks/main.yml
@@ -3,10 +3,6 @@
     when:
     - generate_menus | default(true) | bool
 
-  - include: generate_pciids.yml
-    when:
-    - generate_pciids | default(true) | bool
-
   - include: generate_menus_custom.yml
     when:
     - custom_generate_menus | default(false) | bool