X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0938cd3031a6e245af650642fe74c7705f940944..aa196b361191e3498cd8b96f0669722a4742cca2:/package/base-files/files/etc/init.d/fstab

diff --git a/package/base-files/files/etc/init.d/fstab b/package/base-files/files/etc/init.d/fstab
index 6dd52f23b..7d1dffa0b 100755
--- a/package/base-files/files/etc/init.d/fstab
+++ b/package/base-files/files/etc/init.d/fstab
@@ -5,60 +5,59 @@ START=20
 
 do_mount() {
 	local cfg="$1"
-	config_get fstype "$cfg" fstype
-	fstype="${fstype:-auto}"
-	config_get options "$cfg" options
-	options="${options:-rw}"
+
 	config_get device "$cfg" device
-	[ -n "device" ] || return 0
 	config_get target "$cfg" target
-	[ -n "target" ] || return 0
+	[ -n "$device" -a -n "$target" ] || return 0
+
 	mkdir -p $target
+	config_get fstype "$cfg" fstype 'auto'
+	config_get options "$cfg" options '-rw'
 	config_get_bool enabled "$cfg" "enabled" '1'
-	[ "$enabled" -gt 0 ] && {
-	  /bin/mount -t $fstype -o $options $device $target 
-	}
+	[ "$enabled" -eq 0 ] && options="noauto,$options"
+	echo "$device	$target	$fstype	$options	0	0" >> /tmp/fstab
 }
 
 do_swapon() {
 	local cfg="$1"
+
 	config_get device "$cfg" device
-	[ -n "device" ] || return 0
 	config_get_bool enabled "$cfg" "enabled" '1'
-	[ "$enabled" -gt 0 ] && [ -x /sbin/swapon ] && {
-	  /sbin/swapon $device
-	}
+	[ -n "$device" -a "$enabled" -gt 0 ] || return 0
+	echo "$device	none	swap	sw	0	0" >> /tmp/fstab
 }
 
 do_unmount() {
 	local cfg="$1"
+
 	config_get target "$cfg" target
-	[ -n "target" ] || return 0
 	config_get_bool enabled "$cfg" "enabled" '1'
-	[ "$enabled" -gt 0 ] && {
-	  /bin/umount $target 
-	}
+	[ -n "$target" -a "$enabled" -gt 0 ] || return 0
+	umount $target
 }
 	
 do_swapoff() {
 	local cfg="$1"
+
 	config_get device "$cfg" device
-	[ -n "device" ] || return 0
 	config_get_bool enabled "$cfg" "enabled" '1'
-	[ "$enabled" -gt 0 ] && [ -x /sbin/swapoff ] && {
-	  /sbin/swapoff $device
-	}
+	[ -n "$device" -a  "$enabled" -gt 0 ] && type swapoff >/dev/null || return 0
+	swapoff $device
 }
 
 start() {
 	config_load fstab
+	echo '# WARNING: this is an auto generated file, please use uci to set static filesystems' > /tmp/fstab
 	config_foreach do_mount mount
 	config_foreach do_swapon swap
+	mount -a
+	[ -x /sbin/swapon ] && swapon -a
 }
 
 stop() {
 	config_load fstab
 	config_foreach do_unmount mount
 	config_foreach do_swapoff swap
+	[ -x /sbin/swapoff ] && swapoff -a
 }