c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 01:51:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add cut binary to the initramfs

Browse Source 
Since the `cut -b` command is used by `parse-zfs.sh`,
ensure that it is copied to the initramfs.

Fix spl_hostid when set by cmdline. This follows a
similar logic from the `zgenhostid` script, using `echo`
instead of `printf`.

Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ben Cordero <bencord0@condi.me>
Closes #8197
This commit is contained in:
Ben Cordero 2018-12-13 23:48:46 +00:00 committed by Brian Behlendorf
parent 5aa95ba0d3
commit eff7d78f8a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/dracut/90zfs/module-setup.sh.in
View File

@ -59,6 +59,7 @@ install() {
dracut_install @udevdir@/vdev_id dracut_install @udevdir@/vdev_id
dracut_install awk dracut_install awk
dracut_install basename dracut_install basename
dracut_install cut
dracut_install head dracut_install head
dracut_install @udevdir@/zvol_id dracut_install @udevdir@/zvol_id
inst_hook cmdline 95 "${moddir}/parse-zfs.sh" inst_hook cmdline 95 "${moddir}/parse-zfs.sh"
@ -86,7 +87,7 @@ install() {
BB=`hostid | cut -b 3,4` BB=`hostid | cut -b 3,4`
CC=`hostid | cut -b 5,6` CC=`hostid | cut -b 5,6`
DD=`hostid | cut -b 7,8` DD=`hostid | cut -b 7,8`
printf "\x${DD}\x${CC}\x${BB}\x${AA}" > "${initdir}/etc/hostid" echo -ne "\\x${DD}\\x${CC}\\x${BB}\\x${AA}" > "${initdir}/etc/hostid"
if dracut_module_included "systemd"; then if dracut_module_included "systemd"; then
mkdir -p "${initdir}/$systemdsystemunitdir/zfs-import.target.wants" mkdir -p "${initdir}/$systemdsystemunitdir/zfs-import.target.wants"

2
contrib/dracut/90zfs/parse-zfs.sh.in
View File

@ -10,7 +10,7 @@ if [ -n "${spl_hostid}" ] ; then
BB=$(echo "${spl_hostid}" | cut -b 3,4) BB=$(echo "${spl_hostid}" | cut -b 3,4)
CC=$(echo "${spl_hostid}" | cut -b 5,6) CC=$(echo "${spl_hostid}" | cut -b 5,6)
DD=$(echo "${spl_hostid}" | cut -b 7,8) DD=$(echo "${spl_hostid}" | cut -b 7,8)
printf "\\x%s\\x%s\\x%s\\x%s" "${DD}" "${CC}" "${BB}" "${AA}" >/etc/hostid echo -ne "\\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: $(hostid)" info "ZFS: Using hostid from /etc/hostid: $(hostid)"
else else