diff options
author | Dirk von Suchodoletz | 2007-06-01 17:51:43 +0200 |
---|---|---|
committer | Dirk von Suchodoletz | 2007-06-01 17:51:43 +0200 |
commit | 623d157c45251cd0fece91ba636ff98d65a4ca16 (patch) | |
tree | 2740597400d60845c7918beb58b4d636f9850c9d | |
parent | Make vesamenu.c32 available for optional use (diff) | |
download | core-623d157c45251cd0fece91ba636ff98d65a4ca16.tar.gz core-623d157c45251cd0fece91ba636ff98d65a4ca16.tar.xz core-623d157c45251cd0fece91ba636ff98d65a4ca16.zip |
Check in same fixes as for the branch ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1134 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r-- | initramfs/distro-specs/debian/functions-default | 51 | ||||
-rw-r--r-- | initramfs/distro-specs/ubuntu/functions-default | 4 | ||||
-rwxr-xr-x | initramfs/initrd-stuff/bin/hwautocfg | 2 | ||||
-rw-r--r-- | installer/default_files/hwdata/Cards.local | 4 | ||||
-rw-r--r-- | installer/default_files/hwdata/pcitable.local | 1 |
5 files changed, 35 insertions, 27 deletions
diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default index af8a4bc5..4165adf9 100644 --- a/initramfs/distro-specs/debian/functions-default +++ b/initramfs/distro-specs/debian/functions-default @@ -1,19 +1,15 @@ -# Copyright (c) 2003 - 2006 - RZ Uni Freiburg -# Copyright (c) 2006, 2007 - OpenSLX GmbH -# -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# configuration script for general Debian to configure linux diskless clients +# (executed within initialramfs after genconfig) # -# If you have any feedback please consult http://openslx.org/feedback and -# send your feedback to feedback@openslx.org +# this file is distributed under the GPLv2, see ~/openslx/COPYING # -# General information about OpenSLX can be found at http://openslx.org +# Dirk von Suchodoletz <dvs@OpenSLX.com>, 22-12-2006 +# Felix Endres, 30-04-2006 # -# Configuration script for general Debian to configure linux diskless clients -# (executed within initialramfs after genconfig) +# (c) 2006 - RZ Universitaet Freiburg +# (c) 2006 - OpenSLX GmbH -# empty (placeholder) functions to avoid errors in stage3 are defined at the -# beginning of /etc/functions +# empty functions are defined at the beginning of /etc/functions # distro specific stuff to initialize preinit () { @@ -32,6 +28,22 @@ config_distro () { sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab } +# udev/hotplug - auto device discovery service (deprecated, check and remove) +# Result: 1 is bad, 0 is good +udev_hotplug () { + local result=0 + [ -d /etc/hotplug -a -d /etc/hotplug.d ] || error "$df_errhotpl" nonfatal + echo "Enabling hotplug/udev" + #udevstart && result=0 + #udevtrigger && result=0 + udevd --daemon || result=1 + [ ! -e /sbin/udevsend ] && result=1 + echo "/sbin/udevsend/" > /proc/sys/kernel/hotplug + mkdir -p /dev/.udev/db /dev/.udev/queue + trigger_device_events + return $result +} + # distro specific general function called from servconfig script config_distro () { # add the halt link to the 0 and 6 runlevel directories @@ -70,21 +82,14 @@ local info=$3 } # group of functions for the normal runlevels - first parameter is start -# second stop (fixme: is "stop" needed in Debian?? - Yep) +# second stop # function for ntp configuration config_ntp () { -if [ -f /mnt/etc/init.d/ntp ] ; then +if [ -f /mnt/etc/init.d/ntp -a "x$start_ntp" != "xno" ] ; then echo -e "ntp:x:74:65534:NTP daemon:/var/lib/ntp:/bin/false" \ >>/mnt/etc/passwd - testmkd /mnt/var/lib/ntp/var/run/ntp &>/dev/null - if [ "x$start_ntp" = "xinitial" ] ; then - echo -e "# entry added by $0: $date" \ - >>/mnt/etc/${D_INITDIR}/boot.slx - echo "ntpdate -s -b $ntp_servers >${LOGFILE} 2>&1 &" \ - >>/mnt/etc/${D_INITDIR}/boot.slx - else - rllinker "ntp" "20" "02" - fi + testmkd /mnt/var/lib/ntp/var/run/ntp + rllinker "ntp" "07" "14" fi } diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default index 8e4809ec..37d56c65 100644 --- a/initramfs/distro-specs/ubuntu/functions-default +++ b/initramfs/distro-specs/ubuntu/functions-default @@ -90,13 +90,11 @@ done # second stop # function for ntp configuration config_ntp () { -local start=07 -local stop=14 if [ -f /mnt/etc/init.d/ntp -a "x$start_ntp" != "xno" ] ; then echo -e "ntp:x:74:65534:NTP daemon:/var/lib/ntp:/bin/false" \ >>/mnt/etc/passwd testmkd /mnt/var/lib/ntp/var/run/ntp - rllinker "ntp" "$start" "$stop" + rllinker "ntp" "07" "14" fi } diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg index e565b76b..815f8d75 100755 --- a/initramfs/initrd-stuff/bin/hwautocfg +++ b/initramfs/initrd-stuff/bin/hwautocfg @@ -243,7 +243,7 @@ nwmod () { echo "** loading all defined network adaptor modules at $(sysup)" for mod in ${NWMODULES}; do modprobe ${MODPRV} $mod || error "$init_errnwad" - usleep 5000 + usleep 10000 done return 0 } diff --git a/installer/default_files/hwdata/Cards.local b/installer/default_files/hwdata/Cards.local index 010e2180..94c15aa8 100644 --- a/installer/default_files/hwdata/Cards.local +++ b/installer/default_files/hwdata/Cards.local @@ -36,4 +36,8 @@ NOCLOCKPROBE NAME ATI Radeon RS482 DRIVER radeon +# link for fglrx, not used at the moment +NAME ATI Radeon (fglrx) +SEE ATI Radeon (generic) + # main database diff --git a/installer/default_files/hwdata/pcitable.local b/installer/default_files/hwdata/pcitable.local index b45ee4cb..c66ef550 100644 --- a/installer/default_files/hwdata/pcitable.local +++ b/installer/default_files/hwdata/pcitable.local @@ -26,6 +26,7 @@ 0x1002 0x5834 "Card:ATI Radeon" 0x1002 0x5964 "Card:ATI Radeon RS482" 0x1002 0x5974 "Card:ATI Radeon RS482" +0x1002 0x5b60 "Card:ATI Radeon (generic)" 0x1002 0x5b70 "Card:ATI Radeon (generic)" 0x1002 0x5964 "Card:ATI Radeon (generic)" |