Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4274/config/etc/initrd
Modified Files:
Tag: rel-1-2-patches
mount_cdrom
Log Message:
use exit instead of return as we are not in a subroutine
Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.25.2.18
retrieving revision 1.25.2.19
diff -u -d -r1.25.2.18 -r1.25.2.19
--- mount_cdrom 9 Jun 2006 22:21:05 -0000 1.25.2.18
+++ mount_cdrom 9 Jun 2006 22:30:06 -0000 1.25.2.19
@@ -336,7 +336,7 @@
#$GREEN
#echo "Mounting old version"
#$NORMAL
- mount -o loop -t iso9660 /mnt/bootcd.iso.old ${mountpoint} || return 1
+ mount -o loop -t iso9660 /mnt/bootcd.iso.old ${mountpoint} || exit 1
cd /cdrom
#change to new root
pivot_root . initrd
@@ -362,7 +362,7 @@
# 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 -t iso9660 /mnt/bootcd.iso ${mountpoint} || return 1
+ mount -o loop -t iso9660 /mnt/bootcd.iso ${mountpoint} || exit 1
fi
exit 0
fi
|
