svn commit: r213095 - stable/7/sbin/reboot
Andriy Gapon
avg at FreeBSD.org
Fri Sep 24 07:29:29 UTC 2010
Author: avg
Date: Fri Sep 24 07:29:29 2010
New Revision: 213095
URL: http://svn.freebsd.org/changeset/base/213095
Log:
MFC r212789: nextboot: warn about limitations of /boot/nextboot.conf on ZFS
Modified:
stable/7/sbin/reboot/nextboot.sh
Directory Properties:
stable/7/sbin/reboot/ (props changed)
Modified: stable/7/sbin/reboot/nextboot.sh
==============================================================================
--- stable/7/sbin/reboot/nextboot.sh Fri Sep 24 07:27:53 2010 (r213094)
+++ stable/7/sbin/reboot/nextboot.sh Fri Sep 24 07:29:29 2010 (r213095)
@@ -50,6 +50,14 @@ if [ ${force} = "NO" -a ! -d /boot/${ker
exit 1
fi
+df -Tn "/boot/" 2>/dev/null | while read _fs _type _other ; do
+ [ "zfs" = "${_type}" ] || continue
+ cat 1>&2 <<-EOF
+ WARNING: loader(8) has only R/O support for ZFS
+ nextboot.conf will NOT be reset in case of kernel boot failure
+ EOF
+done
+
cat > ${nextboot_file} << EOF
nextboot_enable="YES"
kernel="${kernel}"
More information about the svn-src-stable-7
mailing list