dracut: 90zfs: touchups #12108

nabijaczleweli · 2021-05-23T14:02:48Z

Motivation and Context

#11750, #11800, #12065

Description

See commit messages

How Has This Been Tested?

I, uh, got the expressions to print the right thing on "OpenSUSE Tumbleweed 20210512", and the reordering is trivially correct. Wait loop is based off reporter's suggested solution.

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Performance enhancement (non-breaking change which improves efficiency)
Code cleanup (non-breaking change which makes code smaller or more readable)
Breaking change (fix or feature that would cause existing functionality to change)
Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
Documentation (a change to man pages or other documentation)

Checklist:

My code follows the OpenZFS code style requirements.
I have updated the documentation accordingly.
I have read the contributing document.
I have added tests to cover my changes. – none apply
I have run the ZFS Test Suite with this change applied. – CI take my hand
All commit messages are properly formatted and contain Signed-off-by.

behlendorf

This was a nice bit of cleanup.

SUSE stores the library at /lib64/libgcc_s.so.1 (/lib/libgcc_s.so.1 for i686 glibc), which is in the search path Also relax the /usr/lib path to catch systems similar to SUSE (/usr/lib64/gcc/x86_64-suse-linux/10/libgcc_s.so) but without the top-level lib64 Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#11750

Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#11800

Signed-off-by: Ahelenia Ziemiańska <[email protected]>

Also reduce password retries to 3 to match i-t Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#12065

Chases 7c64ee9 ("zfs-import-{cache,scan}: change condition to FileNotEmpty") Signed-off-by: Ahelenia Ziemiańska <[email protected]>

nabijaczleweli · 2021-06-04T16:04:15Z

2-week-ish bump, does this need anything more?

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #11800 Closes #12108

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #12108

Also reduce password retries to 3 to match i-t Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #12065 Closes #12108

Chases 7c64ee9 ("zfs-import-{cache,scan}: change condition to FileNotEmpty") Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #12108

behlendorf · 2021-06-04T21:07:15Z

Nope, this is ready. Merged.

SUSE stores the library at /lib64/libgcc_s.so.1 (/lib/libgcc_s.so.1 for i686 glibc), which is in the search path Also relax the /usr/lib path to catch systems similar to SUSE (/usr/lib64/gcc/x86_64-suse-linux/10/libgcc_s.so) but without the top-level lib64 Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#11750 Closes openzfs#12108

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#11800 Closes openzfs#12108

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#12108

Chases 7c64ee9 ("zfs-import-{cache,scan}: change condition to FileNotEmpty") Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#12108

SUSE stores the library at /lib64/libgcc_s.so.1 (/lib/libgcc_s.so.1 for i686 glibc), which is in the search path Also relax the /usr/lib path to catch systems similar to SUSE (/usr/lib64/gcc/x86_64-suse-linux/10/libgcc_s.so) but without the top-level lib64 Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#11750 Closes openzfs#12108

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#11800 Closes openzfs#12108

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#12108

Chases 7c64ee9 ("zfs-import-{cache,scan}: change condition to FileNotEmpty") Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#12108

SUSE stores the library at /lib64/libgcc_s.so.1 (/lib/libgcc_s.so.1 for i686 glibc), which is in the search path Also relax the /usr/lib path to catch systems similar to SUSE (/usr/lib64/gcc/x86_64-suse-linux/10/libgcc_s.so) but without the top-level lib64 Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#11750 Closes openzfs#12108

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#11800 Closes openzfs#12108

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#12108

Chases 7c64ee9 ("zfs-import-{cache,scan}: change condition to FileNotEmpty") Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#12108

Also reduce password retries to 3 to match i-t Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#12065 Closes openzfs#12108

nabijaczleweli mentioned this pull request May 23, 2021

Failed to add zfs to initrd on openSUSE Tumbleweed #11750

Closed

nabijaczleweli force-pushed the suseł branch from a5eb1a3 to 27fb3ef Compare May 23, 2021 14:42

nabijaczleweli mentioned this pull request May 23, 2021

encrypted dataset: dracut pre-mount hook: cannot open '-': dataset does not exist #11800

Closed

nabijaczleweli changed the title ~~dracut: 90zfs: module-setup: try /lib*/libgcc_s.so*, relax /u/l/gcc path~~ dracut: 90zfs: touchups May 23, 2021

nabijaczleweli force-pushed the suseł branch from 2b8908e to 6388876 Compare May 23, 2021 16:06

nabijaczleweli mentioned this pull request May 23, 2021

Race condition in dracut-zfs (90zfs/zfs-load-key.sh) for keylocation on USB dongle #12065

Closed

nabijaczleweli force-pushed the suseł branch 2 times, most recently from c306142 to 2e483a7 Compare May 23, 2021 20:24

ahrens assigned tonynguien May 23, 2021

nabijaczleweli force-pushed the suseł branch 3 times, most recently from e8247ed to a2abbf7 Compare May 24, 2021 18:34

behlendorf added the Status: Code Review Needed Ready for review and testing label May 26, 2021

behlendorf approved these changes May 26, 2021

View reviewed changes

nabijaczleweli added 5 commits June 1, 2021 22:05

dracut: 90zfs: zfs-load-key: don't load unencrypted bootfs' keylocation

f181d1b

Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#11800

Use %%/* instead of awk -F/ {print $1} to strip datasets

16f85f2

Signed-off-by: Ahelenia Ziemiańska <[email protected]>

dracut: 90zfs: zfs-load-key: wait for key to appear for up to 10 seconds

5a31f5d

Also reduce password retries to 3 to match i-t Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#12065

i-t: don't try to import from empty cache

4d11250

Chases 7c64ee9 ("zfs-import-{cache,scan}: change condition to FileNotEmpty") Signed-off-by: Ahelenia Ziemiańska <[email protected]>

nabijaczleweli force-pushed the suseł branch from 74b1bb4 to 4d11250 Compare June 1, 2021 20:07

nabijaczleweli mentioned this pull request Jun 4, 2021

dracut: 90zfs: respect zfs_force=1 on systemd systems #12195

Merged

13 tasks

behlendorf closed this in cfc8dd1 Jun 4, 2021

behlendorf pushed a commit that referenced this pull request Jun 4, 2021

dracut: 90zfs: zfs-load-key: don't load unencrypted bootfs' keylocation

c38bc22

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #11800 Closes #12108

behlendorf pushed a commit that referenced this pull request Jun 4, 2021

Use %%/* instead of awk -F/ {print $1} to strip datasets

b2c68be

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #12108

behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Jun 4, 2021

behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Jun 8, 2021

Use %%/* instead of awk -F/ {print $1} to strip datasets

fcb91ba

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#12108

behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Jun 8, 2021

Use %%/* instead of awk -F/ {print $1} to strip datasets

38eec7d

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#12108

behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Jun 9, 2021

Use %%/* instead of awk -F/ {print $1} to strip datasets

11b165c

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#12108

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dracut: 90zfs: touchups #12108

dracut: 90zfs: touchups #12108

nabijaczleweli commented May 23, 2021 •

edited

Loading

behlendorf left a comment

nabijaczleweli commented Jun 4, 2021 •

edited

Loading

behlendorf commented Jun 4, 2021

dracut: 90zfs: touchups #12108

dracut: 90zfs: touchups #12108

Conversation

nabijaczleweli commented May 23, 2021 • edited Loading

Motivation and Context

Description

How Has This Been Tested?

Types of changes

Checklist:

behlendorf left a comment

Choose a reason for hiding this comment

nabijaczleweli commented Jun 4, 2021 • edited Loading

behlendorf commented Jun 4, 2021

nabijaczleweli commented May 23, 2021 •

edited

Loading

nabijaczleweli commented Jun 4, 2021 •

edited

Loading