X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=dracut%2F90zfs%2Fparse-zfs.sh.in;h=571d263ce102c59a09cc221ec445461a518a2ac3;hb=30930fba219642cb1dadf1c8ef60ff799e3dc424;hp=eaa45241248acb0ba9798fd42f14c75653aa00c5;hpb=185853d9f202b306d9c316b66b774c498ed6577c;p=zfs.git diff --git a/dracut/90zfs/parse-zfs.sh.in b/dracut/90zfs/parse-zfs.sh.in index eaa4524..571d263 100755 --- 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