Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Wrap dracut scripts to 79 chars 

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #347
This commit is contained in:
Zachary Bedell 2011-07-31 00:21:40 -04:00 committed by Brian Behlendorf
parent 7304278d7f
commit 7f4afd300b
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dracut/90zfs/mount-zfs.sh
View File

@ -19,12 +19,14 @@ case "$root" in
# Might be imported by the kernel module, so try searching before # Might be imported by the kernel module, so try searching before
# we import anything. # we import anything.
zfsbootfs=`zpool list -H -o bootfs | sed 'q'` zfsbootfs=`zpool list -H -o bootfs | sed 'q'`
if [ "$?" != "0" ] || [ "$zfsbootfs" = "" ] || [ "$zfsbootfs" = "no pools available" ] ; then if [ "$?" != "0" ] || [ "$zfsbootfs" = "" ] || \
[ "$zfsbootfs" = "no pools available" ] ; then
# Not there, so we need to import everything. # Not there, so we need to import everything.
info "ZFS: Attempting to import additional pools." info "ZFS: Attempting to import additional pools."
zpool import -N -a ${ZPOOL_FORCE} zpool import -N -a ${ZPOOL_FORCE}
zfsbootfs=`zpool list -H -o bootfs | sed 'q'` zfsbootfs=`zpool list -H -o bootfs | sed 'q'`
if [ "$?" != "0" ] || [ "$zfsbootfs" = "" ] || [ "$zfsbootfs" = "no pools available" ] ; then if [ "$?" != "0" ] || [ "$zfsbootfs" = "" ] || \
[ "$zfsbootfs" = "no pools available" ] ; then
rootok=0 rootok=0
pool="" pool=""

3
dracut/90zfs/parse-zfs.sh
View File

@ -10,7 +10,8 @@ if [ "${spl_hostid}" != "" ] ; then
elif [ -f /etc/hostid ] ; then elif [ -f /etc/hostid ] ; then
info "ZFS: Using hostid from /etc/hostid: `cat /etc/hostid`" info "ZFS: Using hostid from /etc/hostid: `cat /etc/hostid`"
else else
warn "ZFS: No hostid found on kernel command line or /etc/hostid. ZFS pools may not import correctly." warn "ZFS: No hostid found on kernel command line or /etc/hostid. "
warn "ZFS: Pools may not import correctly."
fi fi
case "$root" in case "$root" in

15
dracut/README.dracut.markdown
View File

@ -33,16 +33,17 @@ Kernel Command Line
The initramfs' behavior is influenced by the following kernel command line The initramfs' behavior is influenced by the following kernel command line
parameters passed in from the boot loader: parameters passed in from the boot loader:
* `root=...`: If not set, importable pools are searched for a bootfs attribute. * `root=...`: If not set, importable pools are searched for a bootfs
If an explicitly set root is desired, you may use `root=ZFS:pool/dataset` attribute. If an explicitly set root is desired, you may use
`root=ZFS:pool/dataset`
* `zfs_force=0`: If set to 1, the initramfs will run `zpool import -f` when * `zfs_force=0`: If set to 1, the initramfs will run `zpool import -f` when
attempting to import pools if the required pool isn't automatically imported attempting to import pools if the required pool isn't automatically imported
by the zfs module. This can save you a trip to a bootcd if hostid has changed, by the zfs module. This can save you a trip to a bootcd if hostid has
but is dangerous and can lead to zpool corruption, particularly in cases where changed, but is dangerous and can lead to zpool corruption, particularly in
storage is on a shared fabric such as iSCSI where multiple hosts can access cases where storage is on a shared fabric such as iSCSI where multiple hosts
storage devices concurrently. _Please understand the implications of can access storage devices concurrently. _Please understand the implications
force-importing a pool before enabling this option!_ of force-importing a pool before enabling this option!_
* `spl_hostid`: By default, the hostid used by the SPL module is read from * `spl_hostid`: By default, the hostid used by the SPL module is read from
/etc/hostid inside the initramfs. This file is placed there from the host /etc/hostid inside the initramfs. This file is placed there from the host