-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Base scripts on the init scripts included with Debian GNU/Linux
then take code from the already existing ones, trying to merge them into one. + NFS server service is just called 'nfs' in Redhat based system, and nfs-kernel-server on Debian GNU/Linux based. + Merge #2148 - Inform OpenRC that ZFS uses mtab. + Stop after umountfs + When stopping, don't check for LOCKDIR/zfs-mount - it won't be mounted, so the file won't exist making the script not run. + Add a configurable ZFS_INITRD_POST_MODPROBE_SLEEP used in the initrd to sleep after the modprobe. + The import function, do_import(), imports pools by name instead of '-a' [all]. + Test all '/dev/disk/by-*' dirs for import. Include /dev as a last ditch attempt. + Fallback on importing the pool using the cache file (if it exists) if the 'by-id' didn't work. + Add exceptions to pool imports.
- Loading branch information
Showing
11 changed files
with
675 additions
and
805 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
zfs | ||
zfs-common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,20 @@ | ||
initdir = $(DEFAULT_INIT_DIR) | ||
init_SCRIPTS = zfs | ||
|
||
EXTRA_DIST = \ | ||
$(top_srcdir)/etc/init.d/zfs.fedora.in \ | ||
$(top_srcdir)/etc/init.d/zfs.gentoo.in \ | ||
$(top_srcdir)/etc/init.d/zfs.lsb.in \ | ||
$(top_srcdir)/etc/init.d/zfs.lunar.in \ | ||
$(top_srcdir)/etc/init.d/zfs.redhat.in | ||
init_SCRIPTS = zfs-common zfs-mount zfs-share | ||
|
||
$(init_SCRIPTS): | ||
-$(SED) -e 's,@bindir\@,$(bindir),g' \ | ||
-(if [ -e /etc/debian_version ]; then \ | ||
NFS_SRV=nfs-kernel-server; \ | ||
else \ | ||
NFS_SRV=nfs; \ | ||
fi; \ | ||
$(SED) -e 's,@bindir\@,$(bindir),g' \ | ||
-e 's,@sbindir\@,$(sbindir),g' \ | ||
-e 's,@udevdir\@,$(udevdir),g' \ | ||
-e 's,@udevruledir\@,$(udevruledir),g' \ | ||
-e 's,@sysconfdir\@,$(sysconfdir),g' \ | ||
-e 's,@initdir\@,$(initdir),g' \ | ||
'$@.$(DEFAULT_INIT_SCRIPT).in' >'$@' | ||
-e "s,@NFS_SRV\@,$$NFS_SRV,g" \ | ||
'[email protected]' >'$@') | ||
|
||
distclean-local:: | ||
-$(RM) $(init_SCRIPTS) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
# ZoL userland configuration. | ||
|
||
# Run `zfs mount -a` during system start? | ||
# This should be 'no' if zfs-mountall or a systemd generator | ||
# is available. | ||
ZFS_MOUNT='yes' | ||
|
||
# Run `zfs unmount -a` during system stop? | ||
# This should be 'no' on most systems. | ||
ZFS_UNMOUNT='yes' | ||
|
||
# Run `zfs share -a` during system start? | ||
# nb: The shareiscsi, sharenfs, and sharesmb dataset properties. | ||
ZFS_SHARE='yes' | ||
|
||
# Run `zfs unshare -a` during system stop? | ||
ZFS_UNSHARE='yes' | ||
|
||
# Sould we use '-d /dev/disk/by-*' when importing pool. | ||
# This is recomended, but the default 'no' uses the cache | ||
# file. | ||
# Variable is somewhat missleading. Previously the code | ||
# tried _only_ '/dev/disk/by-id', but will now try any | ||
# '/dev/disk/by-*' directory. | ||
USE_DISK_BY_ID='yes' | ||
|
||
# Should the datasets be mounted verbosly (a mount counter | ||
# will be used when mounting if set to 'yes'). | ||
VERBOSE_MOUNT='no' | ||
|
||
# Should we allow overlay mounts (this is standard in Linux, | ||
# but not ZFS which comes from Solaris where this is not allowed). | ||
DO_OVERLAY_MOUNTS='no' | ||
|
||
# Any additional option to the 'zfs mount' command line. | ||
# Include '-o' for each option wanted. | ||
MOUNT_EXTRA_OPTIONS="" | ||
|
||
# Build kernel modules with the --enable-debug switch? | ||
ZFS_DKMS_ENABLE_DEBUG='no' | ||
|
||
# Build kernel modules with the --enable-debug-dmu-tx switch? | ||
ZFS_DKMS_ENABLE_DEBUG_DMU_TX='no' | ||
|
||
# Keep debugging symbols in kernel modules? | ||
ZFS_DKMS_DISABLE_STRIP='no' | ||
|
||
# Wait for this many seconds in the initrd pre_mountroot? | ||
# This delays startup and should be '0' on most systems. | ||
ZFS_INITRD_PRE_MOUNTROOT_SLEEP='0' | ||
|
||
# Wait for this many seconds in the initrd mountroot? | ||
# This delays startup and should be '0' on most systems. | ||
# This might help on systems which have their ZFS root on | ||
# a USB disk that takes just a little longer to be available | ||
ZFS_INITRD_POST_MODPROBE_SLEEP='0' | ||
|
||
# List of additional datasets to mount after the root | ||
# dataset is mounted. | ||
# The init script will use the mountpoint specified in | ||
# the 'mountpoint' property value in the dataset to | ||
# determine where it should be mounted. | ||
#ZFS_INITRD_ADDITIONAL_DATASETS="rpool/ROOT/usr_local" | ||
|
||
# List of pools that should NOT be imported at boot | ||
#ZFS_POOL_EXCEPTIONS="test2" | ||
|
||
# Location of the lockfile. | ||
LOCKDIR=/run/lock |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,240 @@ | ||
# This is a script with common functions etc used by zfs-mount and zfs-share. | ||
# | ||
# It is _NOT_ to be called independently | ||
|
||
PATH=/sbin:/bin:/usr/bin:/usr/sbin | ||
|
||
# Source function library | ||
if [ -f /lib/lsb/init-functions ]; then | ||
. /lib/lsb/init-functions | ||
elif [ -f /etc/rc.d/init.d/functions ]; then | ||
. /etc/rc.d/init.d/functions | ||
fi | ||
|
||
# Of course the functions we need is called differently | ||
# on different distributions - it would be way to easy | ||
# otherwise!! | ||
if type log_failure_msg > /dev/null ; then | ||
# LSB functions | ||
log_begin_msg=log_begin_msg | ||
log_failure_msg=log_failure_msg | ||
log_progress_msg=log_progress_msg | ||
elif type success > /dev/null ; then | ||
# Fedora/RedHat functions | ||
log_begin_msg=success | ||
log_failure_msg=failure | ||
log_progress_msg=echo -n | ||
elif type einfo > /dev/null ; then | ||
# Gentoo functions | ||
log_begin_msg=einfo | ||
log_failure_msg=eerror | ||
log_progress_msg=echo -n | ||
else | ||
log_begin_msg=echo -n | ||
log_failure_msg=echo | ||
log_progress_msg=echo -n | ||
fi | ||
|
||
# The log_end_msg is a little different - it's both an | ||
# echo of a failed message and a return of a code number. | ||
# So if it doesn't exist, we define a very simple one | ||
# that would do the work. | ||
if ! type log_end_msg > /dev/null ; then | ||
log_end_msg() { | ||
ret=$1 | ||
if [ "$ret" -ge 1 ]; then | ||
echo " failed!" | ||
else | ||
echo " success" | ||
fi | ||
return $ret | ||
} | ||
fi | ||
log_end_msg=log_end_msg | ||
|
||
# Paths to what we need | ||
ZFS="@sbindir@/zfs" | ||
ZPOOL="@sbindir@/zpool" | ||
ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache" | ||
|
||
# Sencible defaults | ||
ZFS_MOUNT='yes' | ||
ZFS_UNMOUNT='yes' | ||
LOCKDIR=/var/lock/zfs | ||
|
||
# Source zfs configuration, overriding the defaults | ||
if [ -f /etc/default/zfs ]; then | ||
. /etc/default/zfs | ||
elif [ -f /etc/sysconfig/zfs ]; then | ||
. /etc/sysconfig/zfs | ||
fi | ||
|
||
[ ! -d "$LOCKDIR" ] && mkdir $LOCKDIR | ||
|
||
# ---------------------------------------------------- | ||
|
||
zfs_installed() { | ||
$log_begin_msg "Checking if zfs userspace tools present" | ||
if [ ! -x $ZPOOL ]; then | ||
$log_failure_msg "$ZPOOL binary not found." | ||
$log_end_msg 1 | ||
fi | ||
if [ ! -x $ZFS ]; then | ||
$log_failure_msg "$ZFS binary not found." | ||
$log_end_msg 1 | ||
fi | ||
$log_end_msg 0 | ||
} | ||
|
||
# Do a lot of checks to make sure it's 'safe' to continue with import/mount etc | ||
checksystem() | ||
{ | ||
if [ -z "$init" ]; then | ||
# Not interactive | ||
grep -qiE '(^|[^\\](\\\\)* )zfs=(off|no)( |$)' /proc/cmdline && exit 3 | ||
fi | ||
|
||
[ -f "$LOCKDIR/$servicename" ] && return 3 | ||
|
||
# Check if ZFS is installed. If not, comply to FC standards and bail | ||
zfs_installed || { | ||
$log_failure_msg "not installed" | ||
return 5 | ||
} | ||
|
||
# Requires selinux policy which has not been written. | ||
if [ -r "/selinux/enforce" ] && | ||
[ "$(cat /selinux/enforce)" == "1" ]; then | ||
|
||
$log_failure_msg "SELinux ZFS policy required" | ||
return 4 | ||
fi | ||
|
||
# Delay until all required block devices are present. | ||
if [ -x /sbin/udevadm ]; then | ||
/sbin/udevadm settle | ||
elif [ -x /sbin/udevsettle ]; then | ||
/sbin/udevsettle | ||
fi | ||
|
||
# Load the zfs module stack | ||
if ! grep -q zfs /proc/modules ; then | ||
$log_begin_msg "Loading kernel ZFS infrastructure: " | ||
modprobe zfs || { | ||
$log_failure_msg "Could not load zfs module" | ||
$log_end_msg 1 | ||
return 5 | ||
} | ||
$log_end_msg 0 | ||
fi | ||
sleep 1 | ||
|
||
# fix mtab to include already-mounted fs filesystems, in case there are any | ||
# we ONLY do this if mtab does not point to /proc/mounts | ||
# which is the case in some systems (systemd may bring that soon) | ||
if ! readlink /etc/mtab | grep -q /proc ; then | ||
if grep -qE "(^/dev/zd|^/dev/zvol| zfs )" /proc/mounts ; then | ||
$log_begin_msg "Registering already-mounted ZFS filesystems and volumes: " | ||
reregister_mounts || { | ||
$log_end_msg 1 | ||
return 150 | ||
} | ||
fi | ||
fi | ||
|
||
# Ensure / exists in /etc/mtab, if not update mtab accordingly. | ||
# This should be handled by rc.sysinit but lets be paranoid. | ||
awk '$2 == "/" { exit 1 }' /etc/mtab | ||
RETVAL=$? | ||
if [ "$RETVAL" -eq 0 ]; then | ||
/bin/mount -f / | ||
fi | ||
|
||
if ! [ `uname -m` == "x86_64" ]; then | ||
echo "Warning: You're not running 64bit. Currently native zfs in"; | ||
echo " linux is only supported and tested on 64bit."; | ||
# should we break here? People doing this should know what they | ||
# do, thus i'm not breaking here. | ||
fi | ||
} | ||
|
||
depend() | ||
{ | ||
# Try to allow people to mix and match fstab with ZFS in a way that makes sense. | ||
if [ "$(mountinfo -s /)" == 'zfs' ]; then | ||
before localmount | ||
else | ||
after localmount | ||
fi | ||
|
||
# bootmisc will log to /var which may be a different zfs than root. | ||
before bootmisc logger | ||
use mtab | ||
keyword -lxc -openvz -prefix -vserver | ||
} | ||
|
||
reregister_mounts() { | ||
cat /etc/mtab | while read -r fs mntpnt fstype opts rest ; do | ||
fs=`printf '%b\n' "$fs"` | ||
mntpnt=`printf '%b\n' "$mntpnt"` | ||
if [ "$fstype" == "zfs" ] ; then | ||
if [ "$mntpnt" == "/" ] ; then | ||
mount -f -o zfsutil -t zfs --move / /removethismountpointhoweverpossible | ||
umount --fake /removethismountpointhoweverpossible | ||
else | ||
umount --fake "$mntpnt" | ||
fi | ||
elif echo "$fs" | grep -qE "^/dev/(zd|zvol)" ; then | ||
if [ "$mntpnt" == "/" ] ; then | ||
mount -f -t "$fstype" --move / /removethismountpointhoweverpossible | ||
umount --fake /removethismountpointhoweverpossible | ||
else | ||
umount --fake "$mntpnt" | ||
fi | ||
fi | ||
done | ||
cat /proc/mounts | while read -r fs mntpnt fstype opts rest ; do | ||
fs=`printf '%b\n' "$fs"` | ||
mntpnt=`printf '%b\n' "$mntpnt"` | ||
if [ "$fstype" == "zfs" ] ; then | ||
mount -f -t zfs -o zfsutil "$fs" "$mntpnt" | ||
elif echo "$fs" | grep -q "^/dev/zd" ; then | ||
mount -f -t "$fstype" -o "$opts" "$fs" "$mntpnt" | ||
fi | ||
done | ||
} | ||
|
||
# i need a bash guru to simplify this, since this is copy and paste, but donno how | ||
# to correctly dereference variable names in bash, or how to do this right | ||
|
||
declare -A MTAB | ||
declare -A FSTAB | ||
|
||
# first parameter is a regular expression that filters mtab | ||
read_mtab() { | ||
for fs in "${!MTAB[@]}" ; do unset MTAB["$fs"] ; done | ||
while read -r fs mntpnt fstype opts blah ; do | ||
fs=`printf '%b\n' "$fs"` | ||
MTAB["$fs"]=$mntpnt | ||
done < <(grep -E "$1" /etc/mtab) | ||
} | ||
|
||
in_mtab() { | ||
[ "${MTAB[$1]}" != "" ] | ||
return $? | ||
} | ||
|
||
# first parameter is a regular expression that filters fstab | ||
read_fstab() { | ||
for fs in "${!FSTAB[@]}" ; do unset FSTAB["$fs"] ; done | ||
while read -r fs mntpnt fstype opts blah ; do | ||
fs=`printf '%b\n' "$fs"` | ||
FSTAB["$fs"]=$mntpnt | ||
done < <(grep -E "$1" /etc/fstab) | ||
} | ||
|
||
in_fstab() { | ||
[ "${FSTAB[$1]}" != "" ] | ||
return $? | ||
} | ||
|
Oops, something went wrong.