Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory vz-cvs-3.sog:/tmp/cvs-serv27790/config/etc/initrd
Modified Files:
mount_cdrom
Log Message:
- updated grsecurity to 2.2.2-3.1.6-201112222105
- updated ipac-ng to 1.34.2
- updated patch to 3.1.6
- updated postgresql to 8.4.10
- updated quagga to 0.99.20
- updated radvd to 1.8.3
- updated samba to 3.5.12
- updated stunnel to 4.50
Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- mount_cdrom 21 Dec 2011 01:03:33 -0000 1.55
+++ mount_cdrom 29 Dec 2011 21:32:01 -0000 1.56
@@ -172,10 +172,10 @@
CDROM ) # don't keep it mounted while copying
/sbin/umount -n ${mountpoint}
# it's a CDROM drive therefore we use a blocksize of 2k
- dd if=$disk of=${RAMDISK}/${IMAGE} bs=2048 >/dev/null 2>&1 || COPY2RAM='fail'
+ dd if=$disk of=${RAMDISK}/${IMAGE} bs=2048 > /shm/copytoramdiskoutput 2>&1 || COPY2RAM='fail'
;;
FILE ) # it's a file so copy will do
- cp ${FILEMOUNT}/${IMAGE} ${RAMDISK}/${IMAGE} >/dev/null 2>&1 || COPY2RAM='fail'
+ cp ${FILEMOUNT}/${IMAGE} ${RAMDISK}/${IMAGE} > /shm/copytoramdiskoutput 2>&1 || COPY2RAM='fail'
;;
esac
busy_stop
@@ -184,6 +184,7 @@
# in case of an error we need to clean up
run_from_ram_cleanup () {
$YELLOW; echo "Falling back to standard mount..."; $NORMAL
+ rm /shm/copytoramdiskoutput > /dev/null 2>&1
sleep 10
/sbin/umount -n ${mountpoint} > /dev/null 2>&1
/sbin/umount -n ${RAMDISK} > /dev/null 2>&1
@@ -196,16 +197,21 @@
# if [ "$(df ${RAMDISK} | grep "${RAMDISK}" | awk '{print $(NF-2)}')" -eq 0 ]; then
if [ "x$COPY2RAM" = "xfail" ]; then
$RED;
- echo "ERROR: ramdisk size calculation error"
- echo " the image to copy was bigger than expected"
+ echo "ERROR while copying data to the ramdisk"
echo
- echo 'Please report to bu...@de...'
+ echo 'Please report this on our bug tracking system'
+ echo 'http://sourceforge.net/apps/mantisbt/devil-linux'
+ echo
+ echo 'Output from copy command:'
+ cat /shm/copytoramdiskoutput
echo
$NORMAL
run_from_ram_cleanup
return 1
fi
+ rm /shm/copytoramdiskoutput > /dev/null 2>&1
+
# get size of the copied image
local REAL_SIZE=$(du -k ${RAMDISK}/${IMAGE} | awk '{print $1}')
let REAL_SIZE=REAL_SIZE*10/1024+5 # do correct rounding
|
