diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | scripts/mk-images | 2 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 1 | ||||
| -rwxr-xr-x | utils/trimpciids | 5 |
4 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2005-11-15 Bill Nottingham <notting@redhat.com> + + * scripts/upd-instroot, scripts/mk-images, utils/trimpciids: + Work with multiple videoaliases files. + 2005-11-15 Jeremy Katz <katzj@redhat.com> * anaconda.spec (BuildPreReq): Change for modular X package names diff --git a/scripts/mk-images b/scripts/mk-images index 86cbf55e0..edd4f8fb3 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -314,7 +314,7 @@ makemoduleball() { # create the pci.ids, from modules.alias and the X driver aliases awk '!/^(\t\t|#)/ { print ;if ($0 == "ffff Illegal Vendor ID") nextfile; }' < $PCIIDS | \ - $TRIMPCIIDS ../modules.alias $XDRIVERS > ../pci.ids + $TRIMPCIIDS ../modules.alias $XDRIVERS $XDRIVERS/* > ../pci.ids if [ -n "$MMB_DD" ]; then echo $MMB_DD > $MMB_DIR/rhdd diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 58e361997..40fbef6b5 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -442,6 +442,7 @@ usr/share/terminfo/v/vt100 usr/share/terminfo/v/vt100-nav usr/share/hwdata/pci.ids usr/share/hwdata/videoaliases +usr/share/hwdata/videoaliases/* usr/share/hwdata/videodrivers usr/share/hwdata/MonitorsDB usr/share/rhpxl/extramodes diff --git a/utils/trimpciids b/utils/trimpciids index 2d177acc7..a1900e3ca 100755 --- a/utils/trimpciids +++ b/utils/trimpciids @@ -21,8 +21,9 @@ if f: if (vend, dev) not in devices: devices.append( (vend, dev) ) -f = open(sys.argv[2]) -if f: +for file in sys.argv[2:] + f = open(file) + if f: pcitable = f.readlines() f.close() for line in pcitable: |