From 95c4c34682d1a62776202b009ce746cc4474cf10 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 16 Jul 2009 21:13:48 +0000
Subject: Small add-ons ...

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3012 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/stage3-stuff/bin/hwautocfg           | 8 ++++----
 os-plugins/plugins/bootsplash/XX_bootsplash.sh | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg
index 5cb570bd..620f5232 100755
--- a/initramfs/stage3-stuff/bin/hwautocfg
+++ b/initramfs/stage3-stuff/bin/hwautocfg
@@ -27,7 +27,7 @@ done
 # no kernel messages, switch on hotplug via /sbin/mdev
 echo "0 0 0 0" >/proc/sys/kernel/printk
 echo "/sbin/mdev" >/proc/sys/kernel/hotplug
-modprobe -a ${MODPRV} usbhid hid-bright &
+modprobe -a ${MODPRV} usbhid hid-bright 2>/dev/null &
 nwcardlist=$(echo ${slxconf_listnwmod}|sed "s/\ /|/g")
 hwinfo --netcard --usb-ctrl | grep modprobe | grep -E "$nwcardlist|hcd" | \
   grep -v ehci | sed 's/.* Cmd: "//;s/"//' | sort -u >/etc/modprobe.base
@@ -67,9 +67,9 @@ mdev -s
 [ $DEBUGLEVEL -eq 21 ] && echo "** finished 2nd hwdetection at $(sysup)"
 
 # load disk/optical high level drivers
-modprobe ${MODPRV} ide-cd
-modprobe ${MODPRV} sr_mod
-modprobe ${MODPRV} ide-floppy
+modprobe ${MODPRV} ide-cd 2>/dev/null
+modprobe ${MODPRV} sr_mod 2>/dev/null
+modprobe ${MODPRV} ide-floppy 2>/dev/null
 mdev -s
 
 # load kernel module for ps2 mice and map the mousehandler to /dev/input/mice
diff --git a/os-plugins/plugins/bootsplash/XX_bootsplash.sh b/os-plugins/plugins/bootsplash/XX_bootsplash.sh
index 44fffe7c..8e878e63 100644
--- a/os-plugins/plugins/bootsplash/XX_bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/XX_bootsplash.sh
@@ -27,6 +27,7 @@ if [ -e /initramfs/plugin-conf/bootsplash.conf ]; then
         >>/mnt/etc/init.d/splashy.boot
       d_mkrlscript close splashy.boot ""
       # create a runlevelscript that will start splashy on halt/reboot
+      # fixme: should be done distro specific (in bootsplash.pm, see #474)
       echo '#!/bin/sh' >>/mnt/etc/init.d/splashy.halt
       echo -e ". /etc/rc.status \
         \n. /etc/sysconfig/logfile \
-- 
cgit v1.2.3-55-g7522