From f15252aa203b0eb2517c5dc5d6957415c12e06f8 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Tue, 8 May 2007 17:11:41 +0000
Subject: Use the admin editable Cards.local and pcitable.local files again
 (installed via Makefile to
 SLX_SHARE_PATH/share/templates/hwdata/{Cards,pcitable}.local) ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1030 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 Makefile                                      | 2 ++
 installer/default_files/hwdata/Cards.local    | 9 ++++++---
 installer/default_files/hwdata/pcitable.local | 8 ++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 07d0ecd0..9df0239c 100644
--- a/Makefile
+++ b/Makefile
@@ -198,6 +198,8 @@ supported."; \
 	  $(DESTDIR)$(SLX_CONFIG_PATH)/; \
 	cp -a installer/default_files/machine-setup.default \
 	  $(DESTDIR)$(SLX_SHARE_PATH)/templates/; \
+	cp -a installer/default_files/hwdata/{pcitable.local,Cards.local} \
+	  $(DESTDIR)$(SLX_SHARE_PATH)/templates/; \
 	tar --exclude=.svn -cp -C installer/default_files tftpboot | \
 	  tar -xp -C $(DESTDIR)$(SLX_SHARE_PATH); \
 	cd theming; tar --exclude=.svn -cp * | \
diff --git a/installer/default_files/hwdata/Cards.local b/installer/default_files/hwdata/Cards.local
index fa848fde..010e2180 100644
--- a/installer/default_files/hwdata/Cards.local
+++ b/installer/default_files/hwdata/Cards.local
@@ -9,10 +9,11 @@
 #
 # General information about OpenSLX can be found under http://openslx.org
 #
-#~/usr/share/hwdata/Cards.local
+# <SLX_SHARE_PATH>/share/templates/hwdata/Cards.local
 #
-# local changes to the Cards file. All additions should be documented here, 
-# so that they are not lost ...
+# Local changes to the Cards file. All additions should be documented here, 
+# so that they are not lost ... They are prepended via mkdxsinitrd to the
+# main flat file database
 
 # Dell GX620
 NAME Intel 945
@@ -34,3 +35,5 @@ NOCLOCKPROBE
 # HP AMD64 onboard ATI Radeon RS482
 NAME ATI Radeon RS482
 DRIVER radeon
+
+# main database
diff --git a/installer/default_files/hwdata/pcitable.local b/installer/default_files/hwdata/pcitable.local
index 455c3e9f..940934df 100644
--- a/installer/default_files/hwdata/pcitable.local
+++ b/installer/default_files/hwdata/pcitable.local
@@ -9,17 +9,21 @@
 #
 # General information about OpenSLX can be found under http://openslx.org
 #
-#~/usr/share/hwdata/pcitable.local
+# <SLX_SHARE_PATH>/share/templates/hwdata/pcitable.local
 #
 # local changes to the pcitables file. All additions should be documented 
 # here, so that they are not lost ... the pcitable file seems to be part of
-# RedHat (and others) hardware detection tool suite
+# RedHat (and others) hardware detection tool suite. These changes are
+# prepended via mkdxsinitrd to the main flat file database
 
 0x8086  0x2592  "Card:Intel 915GM"
 0x8086  0x2772  "Card:Intel 945"
 0x8086  0x2792  "Card:Intel 915GM"
 0x8086  0x2592  "Card:Intel 915"
 0x10de  0x0242  "Card:NVIDIA Geforce 6100"
+0x1002  0x5834  "Card:ATI Radeon"
 0x1002  0x5964  "Card:ATI Radeon RS482"
 0x1002  0x5974  "Card:ATI Radeon RS482"
 0x1002  0x5b70  "Card:ATI Radeon (generic)"
+
+# main database
-- 
cgit v1.2.3-55-g7522