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, 9 insertions, 5 deletions

diff --git a/etc/rc.d/hostid b/etc/rc.d/hostid
index d4b56c5..f8a3d94 100755
--- a/etc/rc.d/hostid
+++ b/etc/rc.d/hostid
@@ -28,8 +28,7 @@
 #
 
 # PROVIDE: hostid
-# REQUIRE: root
-# BEFORE: mountcritlocal
+# BEFORE: fsck
 # KEYWORD: nojail
 
 . /etc/rc.subr
@@ -68,7 +67,7 @@ hostid_hardware()
 	esac
 }
 
-hostid_reset()
+hostid_generate()
 {
 	# First look for UUID in hardware.
 	uuid=`hostid_hardware`
@@ -76,12 +75,17 @@ hostid_reset()
 		# If not found, fall back to software-generated UUID.
 		uuid=`uuidgen`
 	fi
+	hostid_set $uuid
+}
+
+hostid_reset()
+{
+	hostid_generate
 	# Store newly generated UUID in ${hostid_file}.
 	echo $uuid > ${hostid_file}
 	if [ $? -ne 0 ]; then
 		warn "could not store hostuuid in ${hostid_file}."
 	fi
-	hostid_set $uuid
 }
 
 hostid_start()
@@ -91,7 +95,7 @@ hostid_start()
 		hostid_set `cat ${hostid_file}`
 	else
 		# No hostid file, generate UUID.
-		hostid_reset
+		hostid_generate
 	fi
 }