Added function for URI interpretation, enabling URI notation for several

sources (fileget, fileservice, ...), moved local configurable hardware
configuration (pcitable.local, Cards.local) to central config directory
on server (added to hwdata files by mkdxsinitrd) ...




git-svn-id: http://svn.openslx.org/svn/openslx/ld4@285 95ad53e4-c205-0410-b2fa-d234c58c8868

4 files changed, 49 insertions, 7 deletions

diff --git a/installer/default_files/hwdata/Cards.local b/installer/default_files/hwdata/Cards.local
new file mode 100644
index 00000000..6e36e5b0
--- /dev/null
+++ b/installer/default_files/hwdata/Cards.local
@@ -0,0 +1,23 @@
+#~/usr/share/hwdata/Cards.local
+#
+# Description:  local changes to the Cards file. All additions should be
+#		documented here, so that they are not lost ...
+#
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-07-2006
+#
+# Copyright:    (c) 2006 - RZ Universitaet Freiburg
+#               (c) 2006 - odlx.org project
+#
+# Version:      0.0.1b
+
+# Dell GX620
+NAME Intel 945
+CHIPSET Intel 945
+DRIVER i810
+NOCLOCKPROBE
+
+# IBM X41
+NAME Intel 915GM
+CHIPSET Intel 915
+DRIVER i810
+NOCLOCKPROBE
diff --git a/installer/default_files/hwdata/pcitable.local b/installer/default_files/hwdata/pcitable.local
new file mode 100644
index 00000000..6b3f4764
--- /dev/null
+++ b/installer/default_files/hwdata/pcitable.local
@@ -0,0 +1,17 @@
+#~/usr/share/hwdata/pcitable.local
+#
+# Description:  local changes to the pcitables file. All additions should be
+#               documented here, so that they are not lost ...
+#               this file seems to be part of RedHat (and others) hardware
+#               detection tool suite
+#
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-07-2006
+#
+# Copyright:    (c) 2006 - RZ Universitaet Freiburg
+#               (c) 2006 - odlx.org project
+#
+# Version:      0.0.1a
+
+0x8086  0x2592  "Card:Intel 915GM"
+0x8086  0x2772  "Card:Intel 945"
+0x8086  0x2792  "Card:Intel 915GM"
diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default
index 418b09af..47643d78 100644
--- a/installer/default_files/machine-setup.default
+++ b/installer/default_files/machine-setup.default
@@ -6,7 +6,7 @@
 #		New settings are simply appended, so that they might 
 #		overwrite previously defined variables 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 09-07-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 24-07-2006
 #		Blabla
 #		Blub
 #
@@ -85,17 +85,19 @@ netbios_workgroup="dxs-network"
 # automounter home (/local_dir - top level directories only) and source 
 # (server:/path)
 automnt_dir="/home"
-automnt_src="$serverip:/home"
+#automnt_src="$serverip:/home"
 
-# scratch space on server
+# scratch space on server "proto://$serverip:/dxs/tmp"
 scratch="$serverip:/dxs/tmp"
 
 # configure and start vmware services
 vmware="no"
-imgsrv="$serverip:/dxs/vmware"
+#imgsrv="(proto://)$serverip:/dxs/vmware"
 
 # kind of X11 display manager to run 
 start_xdmcp="xdm"
+# for kdm/gdm - enable shutdown option on login screen "user/root/none"
+dm_allow_shutdown="user"
 
 # try to start g/k/xdm with X as fast as possible late_dm="no"
 # if there are problems with key, console etc. set late_dm="yes" - adds
diff --git a/installer/ld4-inst b/installer/ld4-inst
index f0b447a1..e3226a2a 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -4,12 +4,12 @@
 #               cloning from rsync source for Diskless X Stations (v4.0)
 #
 # Author(s):    Nico Dietrich, 04-04-2006
-#		Dirk von Suchodoletz <dirk@goe.net>, 20-05-2006
+#		Dirk von Suchodoletz <dirk@goe.net>, 24-07-2006
 #               mj0, 06-07-06
 #
 # Copyright:    (c) 2003, 2006 - RZ Universitaet Freiburg
 #
-# Version:	0.2.1b
+# Version:	0.2.1c
 DEBUG=0
 
 header() {
@@ -454,7 +454,7 @@ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \
       echo -e "LABEL ${client_distro}-${current_kernel}-nbd\n\
   MENU LABEL $j. ${client_distro}-${client_distro_ver} ${current_kernel} Diskless NBD\n\
   KERNEL ${server}::${tftpbootdir}/vmlinuz-${current_kernel}\n\
-  APPEND nbdroot=${server}:5000,${nbdfs} initrd=${server}::${tftpbootdir}/initrd-dxs-${current_kernel} \
+  APPEND nbdroot=${server}:5000/${nbdfs} initrd=${server}::${tftpbootdir}/initrd-dxs-${current_kernel} \
   apic dhcp noldsc debug=$debuglevel elevator=\"noop\" vci=DXS\n\
   ipappend 1\n" >> ${dxs_conf}/${dxs_pxedefault_conf}-${timestamp}
     fi