Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove pools without a bootfs from BOOTFS variable creation #7089

Merged
merged 1 commit into from
Jan 30, 2018

Conversation

prometheanfire
Copy link
Contributor

Use the same method used in zfs-load-key.

Closes: #7085

@prometheanfire
Copy link
Contributor Author

gimme a min to test this, should have a verified result some time tonight, @WoefulDerelict mind testing on a multi-pool system?

@prometheanfire prometheanfire force-pushed the clean-up-zfs-import branch 2 times, most recently from 3022fb1 to 10b8fd7 Compare January 27, 2018 03:03
@WoefulDerelict
Copy link

Not at all. I will nab this and test it shortly.

Use the same method used in zfs-load-key.

Signed-off-by: Matthew Thode <mthode@mthode.org>
@prometheanfire
Copy link
Contributor Author

it looks like two things happened with systemd-236

  1. the systemctl command changed from /usr/bin to /bin
  2. systemd-ask-password isn't working now

@WoefulDerelict
Copy link

WoefulDerelict commented Jan 27, 2018

Arch Linux appears to be forcing systemctl to /usr/bin/ along with the rest of the toolchain. Unfortunate that systemd-ask-password is failing.

I've synced up to 522db29275b81c18c2bf53a95efa1aedeb13b428, cherry picked the patch and tested it on the same system with success. The system booted without the zfs-import-cache.service throwing any errors.

@WoefulDerelict
Copy link

/bin is a symlink to /usr/bin on Arch Linux systems so the proposed change is unlikely to break anything.

@prometheanfire
Copy link
Contributor Author

is it a symlink within the dracut shell as well? (lsinitrd doesnt show that for me)

drwxr-xr-x   2 root     root            0 Jan 26 23:58 bin
lrwxrwxrwx   1 root     root           15 Jan 26 23:58 bin/awk -> ../usr/bin/gawk

@prometheanfire
Copy link
Contributor Author

ok, my problem was that plymouth needed to be rebuilt with the new paths for systemd. this PR should be good to go.

@WoefulDerelict
Copy link

WoefulDerelict commented Jan 27, 2018

By default Arch Linux uses an initramfs CPIO image generated with mkinitcpio. /bin/systemctl resolves properly and zfs-import-cache.service starts without error.

dracult is an option; however, not one I've tested or have something set up to test with.

@codecov
Copy link

codecov bot commented Jan 27, 2018

Codecov Report

Merging #7089 into master will decrease coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #7089      +/-   ##
=========================================
- Coverage    75.6%   75.6%   -0.01%     
=========================================
  Files         296     296              
  Lines       95661   95664       +3     
=========================================
- Hits        72328   72327       -1     
- Misses      23333   23337       +4
Flag Coverage Δ
#kernel 74.8% <ø> (-0.24%) ⬇️
#user 67.93% <ø> (+0.07%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0735ecb...da91823. Read the comment docs.

@behlendorf
Copy link
Contributor

@prometheanfire @WoefulDerelict if I understand correctly from the comment above this PR has been tested and is ready to merge? Can you please confirm.

@prometheanfire
Copy link
Contributor Author

confirmed here

@behlendorf behlendorf merged commit 1d8a71b into openzfs:master Jan 30, 2018
Nasf-Fan pushed a commit to Nasf-Fan/zfs that referenced this pull request Feb 13, 2018
Use the same method used in zfs-load-key.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Llewelyn Trahaearn <WoefulDerelict@GMail.com>
Signed-off-by: Matthew Thode <mthode@mthode.org>
Closes openzfs#7089
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants