Suggestion how to pass SLX_CONFIG_PATH info (via slxmkramfs,

mkdxsinitrd - "make install" setup has to replace a variable in both
files), minor fixes and additions ...


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

7 files changed, 37 insertions, 20 deletions

diff --git a/initramfs/distro-specs/suse/config-10.1 b/initramfs/distro-specs/suse/config-10.1
index 5b7babc7..7229f9c7 100644
--- a/initramfs/distro-specs/suse/config-10.1
+++ b/initramfs/distro-specs/suse/config-10.1
@@ -1,10 +1,10 @@
-# Description:  distro specific settings for SuSE 10.1. This configuration
-#               might change settings from SuSE default configuration file
+# distro specific settings for SuSE 10.1. This configuration might change
+# settings from SuSE default configuration file
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 15-07-2006
+# Dirk von Suchodoletz <dirk@goe.net>, 15-07-2006
 #
-# Copyright:    (c) 2003, 2006 - RZ Universitaet Freiburg
-
+# (c) 2003, 2006 - RZ Universitaet Freiburg
+# (c) 2006 OpenSLX.org Project
 
 # D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE
 # D_ETCEXCL - list of files, wildcards to be excluded from /etc when using
diff --git a/initramfs/distro-specs/suse/functions-10.1 b/initramfs/distro-specs/suse/functions-10.1
index 0a39e86d..17dfee93 100644
--- a/initramfs/distro-specs/suse/functions-10.1
+++ b/initramfs/distro-specs/suse/functions-10.1
@@ -2,9 +2,10 @@
 # in general SuSE base definitions ...  General changes should be done there,
 # version specific changes for the 10.1 go here.
 #
-# Dirk von Suchodoletz <dvs@OpenSLX.com>, 05-09-2006
+# Dirk von Suchodoletz <dvs@OpenSLX.com>, 27-09-2006
 #
 # (c) 2006 - RZ Universitaet Freiburg
+# (c) 2006 - OpenSLX.ORG Project
 
 # some specific stuff to initialize
 preinit () {
@@ -16,7 +17,8 @@ for i in usb_id scsi_id vol_id edd_id ata_id path_id hwup ifup ; do
   echo -e "#!$shell\n:" >/sbin/$i
 done
 mkdir /lib/udev /usr/sbin
-for i in idedma.sh mount.sh rename_netiface create_floppy_devices ; do
+for i in idedma.sh mount.sh rename_netiface \
+         firmware.sh create_floppy_devices ; do
   echo -e "#!$shell\n:" >/lib/udev/$i
 done
 echo -e "#!$shell\n:" >/usr/sbin/alsactl
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 16b8f0e9..f2548b0c 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -1,14 +1,12 @@
-# Description:  configuration script for general SuSE to configure linux 
-#               diskless clients (included by init, hwautocfg, servconfig
-#               within initial ramdisk after inclusion of the main 
-#               functions file). This file is the main base for the several
-#               SuSE distro versions
+# configuration script for general SuSE to configure linux diskless clients 
+# (included by init, hwautocfg, servconfig within initial ramdisk after 
+# inclusion of the main functions file). This file is the main base for the
+# several SuSE distro versions
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 29-07-2006
+# Dirk von Suchodoletz <dvs@OpenSLX.com>, 29-07-2006
 #
-# Copyright:    (c) 2006 - RZ Universitaet Freiburg
-# 
-# Version:      0.3.3a
+# (c) 2006 - RZ Universitaet Freiburg
+# (c) 2006 OpenSLX.org Project
 
 # empty functions are defined at the beginning of /etc/functions
 
diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg
index 22848751..c17df471 100755
--- a/initramfs/initrd-stuff/bin/hwautocfg
+++ b/initramfs/initrd-stuff/bin/hwautocfg
@@ -3,10 +3,10 @@
 # universal (distro independent) hardware autoconfiguration script for 
 # OpenSLX linux diskless clients, using hwconfig from knoppix as base tool 
 #
-# Dirk von Suchodoletz <dvs@OpenSLX.com>, 19-09-2006
+# Dirk von Suchodoletz <dvs@OpenSLX.com>, 27-09-2006
 #
 # (c) 2003 - 2006 - RZ Universitaet Freiburg
-# (c) 2006 - OpenSLX.org
+# (c) 2006 - OpenSLX.org Project
 
 # local functions used within hwautocfg
 displaysetup () {
@@ -296,7 +296,7 @@ for DRIVER in ohci-hcd uhci-hcd ehci-hcd ohci1394; do
     DRIVERLIST="${DRIVERLIST} ${DRIVER}"; }
 done
 # load usbhid (for USB keyboard/mouse) or remove usbcore module if USB 
-# not present
+# is not present
 if [ -n "$USB" ] ; then
   modprobe ${MODPRV} usbhid &
 else rmmod usbcore
@@ -315,6 +315,8 @@ for DRIVER in yenta_socket i82365 pd6729 tcic; do
     PCMCIA="yes"; }
 done
 # should we check for card reader modules too?
+# newer kernels support some of the major multicard readers which could
+# be found in some barebone systems like Pundits or in many laptops
 
 if [ -n "${PCMCIA}" ] ; then
   modprobe ${MODPRV} ds
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 7f7f552d..a85b502e 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -436,6 +436,7 @@ else
   # fixme!!!! just use the relative path from that here:
   # the variable is nowhere to be seen, so it cannot be used here!?!?
   cfgdir="/tftpboot/client-conf"
+  # cfgdir="${SLX_TFTPBOOT_PATH}" # future setting
   local tftpserver=$serverip
   # try to get configuration files successively; start with distro client
   # and try last distro default ...
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd
index 01305cf7..dc17f3d7 100755
--- a/initramfs/mkdxsinitrd
+++ b/initramfs/mkdxsinitrd
@@ -54,6 +54,12 @@ D_INITSCRIPTS="<set in ~/distro-config/distro file>"
 D_XF86CONFFILE="<set in ~/distro-config/distro file>"
 D_XFONTPATH="<set in ~/distro-config/distro file>"
 D_DEFAULTCOUNTRY="<set in ~/distro-config/distro file>"
+# read in the global settings
+#. /etc/opt/openslx/settings.default # temporarily
+# [ -f @@@SLX_CONFIG_PATH@@@/settings.default ] && \
+#    . @@@SLX_CONFIG_PATH@@@/settings.default
+# [ -f @@@SLX_CONFIG_PATH@@@/settings.local ] && \
+#    . @@@SLX_CONFIG_PATH@@@/settings.local
 
 #########################################################################
 # End of global variable declaration, nothing needed to be changed at
@@ -179,6 +185,7 @@ copy_distro_stuff() {
   # fixme!! files should be taken from /usr/share/openslx/distro-specs
   cat distro-specs/$1/config-default >${INSTDIR}/etc/sysconfig/config
   cat distro-specs/$1/config-$2 >>${INSTDIR}/etc/sysconfig/config
+  echo "SLX_TFTPBOOT_PATH=${SLX_TFTPBOOT_PATH}" >>${INSTDIR}/etc/sysconfig/config
   cat distro-specs/$1/functions-default >${INSTDIR}/etc/distro-functions
   cat distro-specs/$1/functions-$2 >>${INSTDIR}/etc/distro-functions
   # would be cool not to copy .svn here ...
diff --git a/initramfs/slxmkramfs b/initramfs/slxmkramfs
index c7dd965a..1586a6ef 100755
--- a/initramfs/slxmkramfs
+++ b/initramfs/slxmkramfs
@@ -8,7 +8,7 @@
 # Dirk von Suchodoletz <dvs@OpenSLX.com>, 2006
 #
 # (c) 2003 - 2006 - RZ Universitaet Freiburg
-# (c) 2006 - OpenSLX.com
+# (c) 2006 - OpenSLX.org Project
 
 # debug level of script itself
 DEBUG=1
@@ -50,6 +50,12 @@ D_INITSCRIPTS="<set in ~/distro-config/distro file>"
 D_XF86CONFFILE="<set in ~/distro-config/distro file>"
 D_XFONTPATH="<set in ~/distro-config/distro file>"
 D_DEFAULTCOUNTRY="<set in ~/distro-config/distro file>"
+# read in the global settings
+#. /etc/opt/openslx/settings.default # temporarily
+# [ -f @@@SLX_CONFIG_PATH@@@/settings.default ] && \
+#    . @@@SLX_CONFIG_PATH@@@/settings.default
+# [ -f @@@SLX_CONFIG_PATH@@@/settings.local ] && \
+#    . @@@SLX_CONFIG_PATH@@@/settings.local
 
 #########################################################################
 # End of global variable declaration, nothing needed to be changed at
@@ -163,6 +169,7 @@ copy_distro_stuff() {
   prefix=${SLX_SHARE_PATH}/distro-specs/$1
   cat $prefix/config-default >${INSTDIR}/etc/sysconfig/config
   cat $prefix/config-$2 >>${INSTDIR}/etc/sysconfig/config
+  echo "SLX_TFTPBOOT_PATH=${SLX_TFTPBOOT_PATH}" >>${INSTDIR}/etc/sysconfig/config
   cat $prefix/functions-default >${INSTDIR}/etc/distro-functions
   cat $prefix/functions-$2 >>${INSTDIR}/etc/distro-functions
   cp -a $prefix/files-default ${INSTDIR}/etc/sysconfig/files 2>/dev/null