* Update paths to zpool/zfs tools,
* Log less for non-error conditions,
* Don't be fatal if umount fails at shutdown -- final init remount
will take care of it if /usr or / are in use
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+ # bootmisc will log to /var which may be a different zfs than root.
+ before net bootmisc
after udev localmount
keyword -lxc -openvz -prefix -vserver
}
CACHEFILE=/etc/zfs/zpool.cache
after udev localmount
keyword -lxc -openvz -prefix -vserver
}
CACHEFILE=/etc/zfs/zpool.cache
-ZPOOL=/usr/sbin/zpool
-ZFS=/usr/sbin/zfs
+ZPOOL=/sbin/zpool
+ZFS=/sbin/zfs
ZFS_MODULE=zfs
checksystem() {
ZFS_MODULE=zfs
checksystem() {
- if [ -c /dev/zfs ]; then
- einfo "ZFS modules already loaded"
- return 0
- else
+ if [ ! -c /dev/zfs ]; then
einfo "Checking if ZFS modules present"
if [ "x$(modprobe -l $ZFS_MODULE | grep $ZFS_MODULE)" == "x" ]; then
eerror "$ZFS_MODULE not found. Is the ZFS package installed?"
einfo "Checking if ZFS modules present"
if [ "x$(modprobe -l $ZFS_MODULE | grep $ZFS_MODULE)" == "x" ]; then
eerror "$ZFS_MODULE not found. Is the ZFS package installed?"
$ZFS umount -a
rv=$?
if [ $rv -ne 0 ]; then
$ZFS umount -a
rv=$?
if [ $rv -ne 0 ]; then
- eerror "Failed to umount ZFS filesystems."
+ einfo "Some ZFS filesystems not unmounted"
+ # Don't fail if we couldn't umount everything. /usr might be in use.
+ eend 0
+ return 0
LOCKFILE=/var/lock/zfs
CACHEFILE=/etc/zfs/zpool.cache
LOCKFILE=/var/lock/zfs
CACHEFILE=/etc/zfs/zpool.cache
-ZPOOL=/usr/sbin/zpool
-ZFS=/usr/sbin/zfs
+ZPOOL=/sbin/zpool
+ZFS=/sbin/zfs
[ -x $ZPOOL ] || exit 1
[ -x $ZFS ] || exit 2
[ -x $ZPOOL ] || exit 1
[ -x $ZFS ] || exit 2