--- trunk/magellan-initscripts/etc/rc.d/init.d/mountfs 2008/03/22 17:54:14 690 +++ trunk/magellan-initscripts/etc/rc.d/init.d/mountfs 2008/03/22 17:54:46 691 @@ -1,5 +1,5 @@ #!/bin/bash -# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/mountfs,v 1.10 2007-08-18 13:55:22 niro Exp $ +# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/mountfs,v 1.11 2008-03-22 17:54:34 niro Exp $ #%rlevels: 7:s 0:k 6:k #%start: 40 @@ -32,7 +32,7 @@ elif [ -f /mnt/cdrom/livecdrootfs.cloop ] then mount -f /mnt/cdrom/livecdrootfs.cloop /mnt/cloop -t ext2 -o ro - + elif [ -f /mnt/cdrom/livecdrootfs.sqsh ] then mount -f /mnt/cdrom/livecdrootfs.sqsh /mnt/cloop -t ext2 -o ro @@ -49,22 +49,13 @@ mount -f / && mount -f /proc # records devfs as mounted - if is_fs_mounted devfs - then - mount -f -t devfs devfs /dev - fi + is_fs_mounted devfs && mount -f -t devfs devfs /dev # records devpts as mounted - if is_fs_mounted devpts - then - mount -f -t devpts devpts /dev/pts - fi + is_fs_mounted devpts && mount -f -t devpts devpts /dev/pts # records sysfs as mounted - if is_fs_mounted sysfs - then - mount -f -t sysfs sysfs /sys - fi + is_fs_mounted sysfs && mount -f -t sysfs sysfs /sys # records udev as mounted if is_fs_mounted udev @@ -77,10 +68,7 @@ fi # records usbfs as mounted - if is_fs_mounted usbfs - then - mount -f -t usbfs usbfs /proc/bus/usb - fi + is_fs_mounted usbfs && mount -f -t usbfs usbfs /proc/bus/usb evaluate_retval @@ -89,7 +77,6 @@ # cannot be mounted at this time, add them to the NO_FS variable # below. All file systems that are added to the variable in the # form of no will be skipped. - NO_FS="nonfs,nosmbfs,noproc,nocoda,noncpfs,noshm" echo -e ${COLOREDSTAR}"Mounting remaining file systems ..." mount -a -t $NO_FS