d5d7e76d2b
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
49 lines
750 B
Bash
Executable File
49 lines
750 B
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# $FreeBSD$
|
|
#
|
|
|
|
# PROVIDE: zvol
|
|
# REQUIRE: hostid
|
|
# BEFORE: fsck
|
|
# KEYWORD: nojail
|
|
|
|
. /etc/rc.subr
|
|
|
|
name="zvol"
|
|
rcvar="zfs_enable"
|
|
start_cmd="zvol_start"
|
|
stop_cmd="zvol_stop"
|
|
required_modules="zfs"
|
|
|
|
zvol_start()
|
|
{
|
|
zfs volinit
|
|
# 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
|
|
}
|
|
|
|
zvol_stop()
|
|
{
|
|
# 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 volfini
|
|
}
|
|
|
|
load_rc_config $name
|
|
run_rc_command "$1"
|