allow localmount and netmount to fail

OpenRC · Aug 17, 2015 · 7341cd8 · 7341cd8
1 parent 279f1e5
commit 7341cd8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -3,6 +3,17 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
+## OpenRC-x.xx
+
+The behaviour of localmount and netmount in this version is changing. In
+the past, these services always started successfully. In this version,
+they will be able to fail if file systems they mount fail to mount. If
+you have file systems listed in fstab which should not be mounted at
+boot time, make sure to add noauto to the mount options. If you have
+file systems that you want to attempt to mount at boot time but failure
+should be allowed, add nofail to the mount options for these file
+systems in fstab.
+
 ## OpenRC-0.14
 
 The binfmt service, which registers misc binary formats with the Linux

diff --git a/init.d/localmount.in b/init.d/localmount.in
@@ -29,9 +29,6 @@ start()
 	ebegin "Mounting local filesystems"
 	mount -at "$types" $no_netdev
 	eend $? "Some local filesystem failed to mount"
-
-	# Always return 0 - some local mounts may not be critical for boot
-	return 0
 }
 
 stop()

diff --git a/init.d/netmount.in b/init.d/netmount.in
@@ -27,7 +27,6 @@ start()
 		rc=$?
 	fi
 	ewend $rc "Could not mount all network filesystems"
-	return 0
 }
 
 stop()