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
Use @ZFS_META LICENSE@ in spec.in files
[zfs.git]
/
dracut
/
90zfs
/
parse-zfs.sh.in
diff --git
a/dracut/90zfs/parse-zfs.sh.in
b/dracut/90zfs/parse-zfs.sh.in
index
25f2dfb
..
571d263
100755
(executable)
--- a/
dracut/90zfs/parse-zfs.sh.in
+++ b/
dracut/90zfs/parse-zfs.sh.in
@@
-6,9
+6,13
@@
spl_hostid=`getarg spl_hostid=`
if [ "${spl_hostid}" != "" ] ; then
info "ZFS: Using hostid from command line: ${spl_hostid}"
spl_hostid=`getarg spl_hostid=`
if [ "${spl_hostid}" != "" ] ; then
info "ZFS: Using hostid from command line: ${spl_hostid}"
- echo "${spl_hostid}" > /etc/hostid
+ AA=`echo ${spl_hostid} | cut -b 1,2`
+ BB=`echo ${spl_hostid} | cut -b 3,4`
+ CC=`echo ${spl_hostid} | cut -b 5,6`
+ DD=`echo ${spl_hostid} | cut -b 7,8`
+ printf "\x$DD\x$CC\x$BB\x$AA" >/etc/hostid
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: `hostid`"
else
warn "ZFS: No hostid found on kernel command line or /etc/hostid. "
warn "ZFS: Pools may not import correctly."
else
warn "ZFS: No hostid found on kernel command line or /etc/hostid. "
warn "ZFS: Pools may not import correctly."
@@
-17,18
+21,19
@@
fi
case "$root" in
""|zfs|zfs:)
# We'll take root unset, root=zfs, or root=zfs:
case "$root" in
""|zfs|zfs:)
# We'll take root unset, root=zfs, or root=zfs:
- # No root set, so we want to read the bootfs attribute. We
can't do
- #
that until udev settles so we'll set dummy values and hope for the
- # best later on.
+ # No root set, so we want to read the bootfs attribute. We
+ #
can't do that until udev settles so we'll set dummy values
+ #
and hope for the
best later on.
root="zfs:AUTO"
rootok=1
root="zfs:AUTO"
rootok=1
+ wait_for_zfs=1
info "ZFS: Enabling autodetection of bootfs after udev settles."
;;
ZFS\=*|zfs:*|zfs:FILESYSTEM\=*|FILESYSTEM\=*)
info "ZFS: Enabling autodetection of bootfs after udev settles."
;;
ZFS\=*|zfs:*|zfs:FILESYSTEM\=*|FILESYSTEM\=*)
- # root is explicit ZFS root. Parse it now.
- #
We can handle
a root=... param in any of the following formats:
+ # root is explicit ZFS root. Parse it now.
We can handle
+ # a root=... param in any of the following formats:
# root=ZFS=rpool/ROOT
# root=zfs:rpool/ROOT
# root=zfs:FILESYSTEM=rpool/ROOT
# root=ZFS=rpool/ROOT
# root=zfs:rpool/ROOT
# root=zfs:FILESYSTEM=rpool/ROOT
@@
-39,6
+44,7
@@
case "$root" in
root="${root#FILESYSTEM=}"
root="zfs:${root#ZFS=}"
rootok=1
root="${root#FILESYSTEM=}"
root="zfs:${root#ZFS=}"
rootok=1
+ wait_for_zfs=1
info "ZFS: Set ${root} as bootfs."
;;
info "ZFS: Set ${root} as bootfs."
;;
@@
-46,5
+52,7
@@
esac
# Make sure Dracut is happy that we have a root and will wait for ZFS
# modules to settle before mounting.
# Make sure Dracut is happy that we have a root and will wait for ZFS
# modules to settle before mounting.
-ln -s /dev/null /dev/root 2>/dev/null
-echo '[ -e /dev/zfs ]' > $hookdir/initqueue/finished/zfs.sh
+if [ "${wait_for_zfs}" = "1" ]; then
+ ln -s /dev/null /dev/root 2>/dev/null
+ echo '[ -e /dev/zfs ]' > $hookdir/initqueue/finished/zfs.sh
+fi