Linux 3.3 compat, sops->show_options()

[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 eaa4524..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}"
-       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
-       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."
@@ -48,7 +52,7 @@ esac
 
 # Make sure Dracut is happy that we have a root and will wait for ZFS
 # modules to settle before mounting.
-if [ "${wait_for_zfs}" == "1" ]; then
+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