diff options
| author | Dirk von Suchodoletz | 2006-10-01 19:48:45 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-10-01 19:48:45 +0200 |
| commit | 16a62704a825816726d3c8f38a2d57d230360d79 (patch) | |
| tree | dd9f7ff0835685893c13970912f2b8a65bb7ac5f /initramfs/initrd-stuff | |
| parent | * added support for new cmdline option '--use-absolute-tftp-path' which causes (diff) | |
| download | core-16a62704a825816726d3c8f38a2d57d230360d79.tar.gz core-16a62704a825816726d3c8f38a2d57d230360d79.tar.xz core-16a62704a825816726d3c8f38a2d57d230360d79.zip | |
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
Diffstat (limited to 'initramfs/initrd-stuff')
| -rwxr-xr-x | initramfs/initrd-stuff/bin/hwautocfg | 8 | ||||
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 1 |
2 files changed, 6 insertions, 3 deletions
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 ... |