Currently there is a problem with fscking UFS file systems created on

top of ZVOLs. The problem is that rc.d/fsck runs before rc.d/zfs. The
latter makes ZVOLs to appear in /dev/. In such case rc.d/fsck cannot
find devfs entry and aborts. We cannot simply move rc.d/zfs before
rc.d/fsck, because we first want kern.hostid to be configured (by
rc.d/hostid). If we won't wait (hostid will be 0) we can reuse disks
which are in use by different systems (eg. in SAN/NAS environment).
We also cannot move rc.d/hostid before rc.d/fsck, because rc.d/hostid on
first system start stores generated kern.hostuuid in /etc/hostid file,
so it needs root file system to be mounted read-write.

The fix is to split rc.d/hostid so that rc.d/hostid (which will now run
before rc.d/fsck) only generates hostid and sets up sysctls, but doesn't
touch root file system and rc.d/hostid_save (which is run after
rc.d/root) and only creates /etc/hostid file.

With that in place, we can move ZVOL initialization to dedicated
rc.d/zvol script which runs before rc.d/fsck.

PR:		conf/120194
Reported by:	James Snow <snow@teardrop.org>
Reviewed by:	brooks
Approved by:	re (kib)
MFC after:	2 weeks

1 files changed, 0 insertions, 20 deletions

diff --git a/etc/rc.d/zfs b/etc/rc.d/zfs
index 4f9bc6a..cabbcf6 100755
--- a/etc/rc.d/zfs
+++ b/etc/rc.d/zfs
@@ -23,21 +23,11 @@ zfs_start_jail()
 
 zfs_start_main()
 {
-	zfs volinit
 	zfs mount -a
 	zfs share -a
 	if [ ! -r /etc/zfs/exports ]; then
 		touch /etc/zfs/exports
 	fi
-	# Enable swap on ZVOLs with property org.freebsd:swap=on.
-	zfs list -H -o org.freebsd:swap,name -t volume | \
-	while read state name; do
-		case "${state}" in
-		[oO][nN])
-			swapon /dev/zvol/${name}
-			;;
-		esac
-	done
 }
 
 zfs_start()
@@ -58,18 +48,8 @@ zfs_stop_jail()
 
 zfs_stop_main()
 {
-	# Disable swap on ZVOLs with property org.freebsd:swap=on.
-	zfs list -H -o org.freebsd:swap,name -t volume | \
-	while read state name; do
-		case "${state}" in
-		[oO][nN])
-			swapoff /dev/zvol/${name}
-			;;
-		esac
-	done
 	zfs unshare -a
 	zfs unmount -a
-	zfs volfini
 }
 
 zfs_stop()