--- /dev/null
+#!/bin/sh
+
+count_zvols() {
+ if [ -z "$zvols" ]; then
+ echo 0
+ else
+ echo "$zvols" | wc -l
+ fi
+}
+
+filter_out_zvols_with_links() {
+ while read -r zvol; do
+ if [ ! -L "/dev/zvol/$zvol" ]; then
+ echo "$zvol"
+ fi
+ done
+}
+
+filter_out_deleted_zvols() {
+ while read -r zvol; do
+ if zfs list "$zvol" >/dev/null 2>&1; then
+ echo "$zvol"
+ fi
+ done
+}
+
+list_zvols() {
+ zfs list -t volume -H -o name,volmode | while read -r zvol_line; do
+ name=$(echo "$zvol_line" | awk '{print $1}')
+ volmode=$(echo "$zvol_line" | awk '{print $2}')
+ # /dev links are not created for zvols with volmode = "none".
+ [ "$volmode" = "none" ] || echo "$name"
+ done
+}
+
+zvols=$(list_zvols)
+zvols_count=$(count_zvols)
+if [ "$zvols_count" -eq 0 ]; then
+ echo "No zvols found, nothing to do."
+ exit 0
+fi
+
+echo "Testing $zvols_count zvol links"
+
+outer_loop=0
+while [ "$outer_loop" -lt 20 ]; do
+ outer_loop=$((outer_loop + 1))
+
+ old_zvols_count=$(count_zvols)
+
+ inner_loop=0
+ while [ "$inner_loop" -lt 30 ]; do
+ inner_loop=$((inner_loop + 1))
+
+ zvols="$(echo "$zvols" | filter_out_zvols_with_links)"
+
+ zvols_count=$(count_zvols)
+ if [ "$zvols_count" -eq 0 ]; then
+ echo "All zvol links are now present."
+ exit 0
+ fi
+ sleep 1
+ done
+
+ echo "Still waiting on $zvols_count zvol links ..."
+ #
+ # Although zvols should normally not be deleted at boot time,
+ # if that is the case then their links will be missing and
+ # we would stall.
+ #
+ if [ "$old_zvols_count" -eq "$zvols_count" ]; then
+ echo "No progress since last loop."
+ echo "Checking if any zvols were deleted."
+
+ zvols=$(echo "$zvols" | filter_out_deleted_zvols)
+ zvols_count=$(count_zvols)
+
+ if [ "$old_zvols_count" -ne "$zvols_count" ]; then
+ echo "$((old_zvols_count - zvols_count)) zvol(s) deleted."
+ fi
+
+ if [ "$zvols_count" -ne 0 ]; then
+ echo "Remaining zvols:"
+ echo "$zvols"
+ else
+ echo "All zvol links are now present."
+ exit 0
+ fi
+ fi
+done
+
+echo "Timed out waiting on zvol links"
+exit 1
zfs-import-scan.service \
zfs-mount.service \
zfs-share.service \
+ zfs-volume-wait.service \
zfs-import.target \
+ zfs-volumes.target \
zfs.target
EXTRA_DIST = \
$(top_srcdir)/etc/systemd/system/zfs-mount.service.in \
$(top_srcdir)/etc/systemd/system/zfs-share.service.in \
$(top_srcdir)/etc/systemd/system/zfs-import.target.in \
+ $(top_srcdir)/etc/systemd/system/zfs-volume-wait.service.in \
+ $(top_srcdir)/etc/systemd/system/zfs-volumes.target.in \
$(top_srcdir)/etc/systemd/system/zfs.target.in \
$(top_srcdir)/etc/systemd/system/50-zfs.preset.in
%if 0%{?_systemd}
%define systemd --enable-systemd --with-systemdunitdir=%{_unitdir} --with-systemdpresetdir=%{_presetdir} --with-systemdmodulesloaddir=%{_modulesloaddir} --with-systemdgeneratordir=%{_systemdgeneratordir} --disable-sysvinit
- %define systemd_svcs zfs-import-cache.service zfs-import-scan.service zfs-mount.service zfs-share.service zfs-zed.service zfs.target zfs-import.target
+ %define systemd_svcs zfs-import-cache.service zfs-import-scan.service zfs-mount.service zfs-share.service zfs-zed.service zfs.target zfs-import.target zfs-volume-wait.service zfs-volumes.target
%else
%define systemd --enable-sysvinit --disable-systemd
%endif
%{_sbindir}/*
%{_bindir}/raidz_test
%{_bindir}/zgenhostid
+%{_bindir}/zvol_wait
# Optional Python 2/3 scripts
%{_bindir}/arc_summary
%{_bindir}/arcstat