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

dracut: Support /usr/bin as 'systemctl' path #11487

Merged
merged 1 commit into from
Jan 21, 2021

Conversation

lhuedepohl
Copy link
Contributor

@lhuedepohl lhuedepohl commented Jan 20, 2021

On openSUSE the initrd has the systemctl binary in /usr/bin, check this path as well

How Has This Been Tested?

I build zfs packages for openSUSE, available at https://build.opensuse.org/project/show/home:lorenz:filesystems
This commit is included as a patch there, and the resulting packages are in active use by myself and a few others. With the patch, the affected dracut initrd zfs services are then active also on openSUSE.

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:

On openSUSE the initrd has systemctl in /usr/bin, check this path as
well

Signed-off-by: Lorenz Hüdepohl <dev@stellardeath.org>
Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The systemd man page makes it pretty clear we shouldn't need the full path here, so this makes sense to me. I see @rlaager made the same observation in the original PR, #8510 (comment), but I'm not sure why it wasn't incorporated in that change. @aerusso you might also want to double check that this is OK for Debian.

@behlendorf behlendorf added the Status: Accepted Ready to integrate (reviewed, tested) label Jan 20, 2021
Copy link
Member

@rlaager rlaager left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On Debian, systemctl is installed to /bin. On a non-usrmerge system, that's it. On a usrmerge system, then /bin and /usr/bin/ are the same thing. I don't see any problem from this change.

@behlendorf behlendorf merged commit 984362a into openzfs:master Jan 21, 2021
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Jan 22, 2021
On openSUSE the initrd has systemctl in /usr/bin, check this path as
well.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Laager <rlaager@wiktel.com>
Signed-off-by: Lorenz Hüdepohl <dev@stellardeath.org>
Closes openzfs#11487
behlendorf pushed a commit that referenced this pull request Jan 23, 2021
On openSUSE the initrd has systemctl in /usr/bin, check this path as
well.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Laager <rlaager@wiktel.com>
Signed-off-by: Lorenz Hüdepohl <dev@stellardeath.org>
Closes #11487
jsai20 pushed a commit to jsai20/zfs that referenced this pull request Mar 30, 2021
On openSUSE the initrd has systemctl in /usr/bin, check this path as
well.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Laager <rlaager@wiktel.com>
Signed-off-by: Lorenz Hüdepohl <dev@stellardeath.org>
Closes openzfs#11487
sempervictus pushed a commit to sempervictus/zfs that referenced this pull request May 31, 2021
On openSUSE the initrd has systemctl in /usr/bin, check this path as
well.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Laager <rlaager@wiktel.com>
Signed-off-by: Lorenz Hüdepohl <dev@stellardeath.org>
Closes openzfs#11487
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants