|
From: <pa...@us...> - 2009-03-09 17:07:02
|
Revision: 2655
http://morphix.svn.sourceforge.net/morphix/?rev=2655&view=rev
Author: paul_c
Date: 2009-03-09 17:06:48 +0000 (Mon, 09 Mar 2009)
Log Message:
-----------
Silence warnings/errors when attempting to load nonexistant drivers
(they *might* be built in rather than compiled as modules).
Thanks to Plugh for the feedback.
Modified Paths:
--------------
trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc
Modified: trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc
===================================================================
--- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2009-03-09 16:17:24 UTC (rev 2654)
+++ trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2009-03-09 17:06:48 UTC (rev 2655)
@@ -227,25 +227,25 @@
}
# load modules needed to use VFAT filesystem
-$INSMOD -f /modules/nls/nls_cp437$KEXT >/dev/null
-$INSMOD -f /modules/nls/nls_iso8859-1$KEXT >/dev/null
+$INSMOD -f /modules/nls/nls_cp437$KEXT >/dev/null 2>&1
+$INSMOD -f /modules/nls/nls_iso8859-1$KEXT >/dev/null 2>&1
# SCSI modules need to be loaded before usb-storage
-$INSMOD -f /modules/scsi/scsi_mod$KEXT >/dev/null
-$INSMOD -f /modules/scsi/sg$KEXT >/dev/null
-$INSMOD -f /modules/scsi/sr_mod$KEXT >/dev/null
-$INSMOD -f /modules/scsi/sd_mod$KEXT >/dev/null
-$INSMOD -f /modules/scsi/st$KEXT >/dev/null
+$INSMOD -f /modules/scsi/scsi_mod$KEXT >/dev/null 2>&1
+$INSMOD -f /modules/scsi/sg$KEXT >/dev/null 2>&1
+$INSMOD -f /modules/scsi/sr_mod$KEXT >/dev/null 2>&1
+$INSMOD -f /modules/scsi/sd_mod$KEXT >/dev/null 2>&1
+$INSMOD -f /modules/scsi/st$KEXT >/dev/null 2>&1
-$INSMOD -f /modules/usb/usbcore$KEXT >/dev/null
+$INSMOD -f /modules/usb/usbcore$KEXT >/dev/null 2>&1
-$INSMOD -f /modules/usb/ehci-hcd$KEXT >/dev/null
-$INSMOD -f /modules/usb/uhci-hcd$KEXT >/dev/null
-$INSMOD -f /modules/usb/ohci-hcd$KEXT >/dev/null
-$INSMOD -f /modules/scsi/sd_mod$KEXT >/dev/null
-$INSMOD -f /modules/usb/usb-storage$KEXT >/dev/null
+$INSMOD -f /modules/usb/ehci-hcd$KEXT >/dev/null 2>&1
+$INSMOD -f /modules/usb/uhci-hcd$KEXT >/dev/null 2>&1
+$INSMOD -f /modules/usb/ohci-hcd$KEXT >/dev/null 2>&1
+$INSMOD -f /modules/scsi/sd_mod$KEXT >/dev/null 2>&1
+$INSMOD -f /modules/usb/usb-storage$KEXT >/dev/null 2>&1
# Load the USB keyboard driver *just* in case..
-$INSMOD -f /modules/usb/usbkbd$KEXT >/dev/null
+$INSMOD -f /modules/usb/usbkbd$KEXT >/dev/null 2>&1
# Wait for devices to be registered
sleep 2
@@ -348,7 +348,7 @@
do
echo -n "${CRE}${BLUE}Looking for CDROM in: ${MAGENTA}$i${NORMAL} "
if [ -z "$FROMISO" ]; then
- if mountit $i /$MOUNT_IMAGE "-o $MOUNT_OPT" >/dev/null
+ if mountit $i /$MOUNT_IMAGE "-o $MOUNT_OPT" >/dev/null 2>&1
then
if test -d /$MOUNT_IMAGE/$HD_DIRECTORY/base
then
@@ -390,11 +390,11 @@
fi
done
-[ -n "$HD_DIRECTORY" ] && mount -o bind,ro /$MOUNT_IMAGE/$HD_DIRECTORY /cdrom >/dev/null
+[ -n "$HD_DIRECTORY" ] && mount -o bind,ro /$MOUNT_IMAGE/$HD_DIRECTORY /cdrom >/dev/null 2>&1
if test -n "$SPLASH" -a -f /bootsplash/config/bootsplash2-1024x768.cfg; then
-splash -s -u 1000 /bootsplash/config/bootsplash2-1024x768.cfg >/dev/null
+splash -s -u 1000 /bootsplash/config/bootsplash2-1024x768.cfg >/dev/null 2>&1
fi
# We now enable DMA right here, for faster reading/writing from/to IDE devices
@@ -618,7 +618,7 @@
# ln -s /MorphixCD/var/cache/apt /var/cache/ 2>/dev/null
rm /etc/resolv.conf 2>/dev/null
- ln -s /MorphixCD/etc/skel /etc/dhcpc/resolv.conf \
+ ln -sf /MorphixCD/etc/skel /etc/dhcpc/resolv.conf \
/etc/ >/dev/null
# This is a memory-hogging hack, but somehow there isn't enough room on the first ramdisk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|