Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5673
Modified Files:
mount_cdrom
Log Message:
- we use mount from util-linux instead of busybox's one (bb bug prevents loop mounting)
Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- mount_cdrom 23 Oct 2006 21:02:00 -0000 1.39
+++ mount_cdrom 23 Jul 2007 13:48:54 -0000 1.40
@@ -41,7 +41,7 @@
for disk in $CDROMS
do
echo -n "checking $disk "
- if mount -n -t iso9660 -o ro $disk $1 2> /dev/null; then
+ if /sbin/mount -n -t iso9660 -o ro $disk $1 2> /dev/null; then
if [ -e $1/DEVIL-LINUX ] ; then
if [ "$3" != "silent" ]; then
$YELLOW
@@ -78,7 +78,7 @@
for disk in $DISCS
do
echo -n "checking $disk "
- if mount -n -t auto -o rw,noatime $disk /cd 2> /dev/null; then
+ if /sbin/mount -n -t auto -o rw,noatime $disk /cd 2> /dev/null; then
if [ -e /cd/DEVIL-LINUX ] ; then
$GREEN
echo "media found"
@@ -104,7 +104,7 @@
echo "Upgrading System Boot Files"
$NORMAL
- mount -o loop=/dev/loop0 -t iso9660 /cd/bootcd.iso /cdrom
+ /sbin/mount -o loop -t iso9660 /cd/bootcd.iso /cdrom
cp -fp /cdrom/boot/* /cd/boot/ 2> /dev/null
cp -fp /cdrom/DEVIL-LINUX /cd/
@@ -118,7 +118,7 @@
$GREEN
echo "Mounting old version"
$NORMAL
- mount -o loop=/dev/loop0 -t iso9660 /cd/bootcd.iso.old $1 || return 1
+ /sbin/mount -o loop -t iso9660 /cd/bootcd.iso.old $1 || return 1
echo $disk > /shm/DL_DEVICE
dl_version=`cat /cd/DEVIL-LINUX 2> /dev/null`
exit 0
@@ -135,8 +135,8 @@
# is attempted to umount it in pre_init but will fail
# because bootcd.iso is still mounted inside it.
# RO will make it less painfull.
- mount -o remount,ro,noatime $disk 2> /dev/null
- mount -o loop=/dev/loop0 -t iso9660 /cd/bootcd.iso $1 || return 1
+ /sbin/mount -o remount,ro,noatime $disk 2> /dev/null
+ /sbin/mount -o loop -t iso9660 /cd/bootcd.iso $1 || return 1
echo $disk > /shm/DL_DEVICE
dl_version=`cat /cd/DEVIL-LINUX 2> /dev/null`
if [ "$3" != "silent" ]; then
|
