Menu
▾
▴
morphix-cvs
|
From: <ale...@us...> - 2009-01-15 23:20:08
|
Revision: 2637
http://morphix.svn.sourceforge.net/morphix/?rev=2637&view=rev
Author: alextreme
Date: 2009-01-15 23:20:05 +0000 (Thu, 15 Jan 2009)
Log Message:
-----------
* This might fix copy-to-memory.
* It might not.
Modified Paths:
--------------
trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc
Modified: trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc
===================================================================
--- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2008-06-20 13:54:41 UTC (rev 2636)
+++ trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2009-01-15 23:20:05 UTC (rev 2637)
@@ -453,18 +453,18 @@
cat /MorphixCD/etc/ld.so.cache > /etc/ld.so.cache
echo " * Copying /cdrom to RamDisk/Harddisk, please be patient..." # Hey, we could use some fancy dialog skript here :-))
- /bin/mkdir -p /cdrom2/$DERIVATE
+ /bin/mkdir -p /cdrom2/$DERIVATE-ctm
if [ -n "$COPYTORAM" ]
then
/bin/mount -t tmpfs -o size=800M /dev/shm /cdrom2
- /bin/cp -a /cdrom/* /cdrom2/$DERIVATE # Copy everything to /cdrom2; yes we need more things then only the KNOPPIX/Morphix image, we don't want to produce problems we hadn't before, do we ? (note from Alex: this also copies any modules on the cdrom. Gotta love this patch :)
+ /bin/cp -a /cdrom/* /cdrom2/$DERIVATE-ctm # Copy everything to /cdrom2; yes we need more things then only the KNOPPIX/Morphix image, we don't want to produce problems we hadn't before, do we ? (note from Alex: this also copies any modules on the cdrom. Gotta love this patch :)
else
COPYTOHD=$(echo $CMDLINE | /usr/bin/tr ' ' '\n' | /bin/sed -n '/tohd=/s/.*=//p' | /usr/bin/tail -1)
echo -n "${CRE} ${GREEN}* Copying ${DERIVATE} CDROM to ${MAGENTA}/dev/$COPYTOHD${GREEN}... Please be patient. ${NORMAL}"
if mountit /dev/$COPYTOHD /cdrom2 >/dev/null
then
- /bin/mkdir /cdrom2/$DERIVATE
- /bin/cp -a /cdrom/* /cdrom2/$DERIVATE
+ /bin/mkdir /cdrom2/$DERIVATE-ctm
+ /bin/cp -a /cdrom/* /cdrom2/$DERIVATE-ctm
#/bin/mount -o remount,ro /dev/$COPYTOHD /cdrom2
else
echo "${CRE} ${RED}* Copying ${DERIVATE} CDROM failed. /dev/$COPYTOHD is not mountable. ${NORMAL}"
@@ -475,13 +475,13 @@
[ -z "$USE_SQUASH" ] && $RMMOD cloop # release CD
echo "0" > /proc/sys/kernel/printk # Debugging
umount /cdrom # unmount CD
- if test -f /cdrom2/$DERIVATE/base/morphix; then
+ if test -f /cdrom2/$DERIVATE-ctm/base/morphix; then
if [ -z "$USE_SQUASH" ];then
$INSMOD -f /modules/cloop$KEXT 2> /dev/null
- $LOSETUP /dev/cloop /cdrom2/$DERIVATE/base/morphix
+ $LOSETUP /dev/cloop /cdrom2/$DERIVATE-ctm/base/morphix
mountit /dev/cloop /MorphixCD "-o ro" || FOUND_MORPHIX="" 2> /dev/null
else
- mount -t squashfs -o "loop,ro" /cdrom2/$DERIVATE/base/morphix /MorphixCD || FOUND_MORPHIX="" 2> /dev/null
+ mount -t squashfs -o "loop,ro" /cdrom2/$DERIVATE-ctm/base/morphix /MorphixCD || FOUND_MORPHIX="" 2> /dev/null
fi
else
FOUND_MORPHIX=""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2009-01-16 23:52:21
|
Revision: 2639
http://morphix.svn.sourceforge.net/morphix/?rev=2639&view=rev
Author: paul_c
Date: 2009-01-16 23:52:13 +0000 (Fri, 16 Jan 2009)
Log Message:
-----------
Errant ; removed.
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-01-16 21:33:53 UTC (rev 2638)
+++ trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2009-01-16 23:52:13 UTC (rev 2639)
@@ -522,7 +522,7 @@
hash -r
# Did we copy from ram ?
- if test -n "$COPYTO";
+ if test -n "$COPYTO"
then
rmdir /cdrom
ln -s /cdrom2 /cdrom # make a symlink and go on to normal boot
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
Thanks for helping keep SourceForge clean.
X