git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Soft to hard tabs
[zfs.git]
/
etc
/
init.d
/
zfs.lsb
diff --git
a/etc/init.d/zfs.lsb
b/etc/init.d/zfs.lsb
index
a84c1df
..
ce541a9
100644
(file)
--- a/
etc/init.d/zfs.lsb
+++ b/
etc/init.d/zfs.lsb
@@
-32,8
+32,8
@@
RETVAL=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
@@
-50,6
+50,9
@@
start()
return 4
fi
return 4
fi
+ # Delay until all required block devices are present.
+ udevadm settle
+
# Load the zfs module stack
/sbin/modprobe zfs
# Load the zfs module stack
/sbin/modprobe zfs
@@
-71,6
+74,10
@@
start()
log_begin_msg "Mounting ZFS filesystems"
$ZFS mount -a
log_end_msg $?
log_begin_msg "Mounting ZFS filesystems"
$ZFS mount -a
log_end_msg $?
+
+ log_begin_msg "Exporting ZFS filesystems"
+ $ZFS share -a
+ log_end_msg $?
fi
touch $LOCKFILE
fi
touch $LOCKFILE