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

prevent running /etc/init.d/zfs-import if using systemd #3838

Closed
wants to merge 6 commits into from
Closed

prevent running /etc/init.d/zfs-import if using systemd #3838

wants to merge 6 commits into from

Conversation

ggzengel
Copy link
Contributor

For systems with systemd in sysv init compatibility mode you have to prevent that services in /etc/init.d will be executed if there is a equivalent in systemd.
There is zfs-import without a corresponding systemd service. You have to add 'Conflicts=zfs-import.service' to zfs-import-cache.service and zfs-import-scan.service.

@FransUrbo
Copy link
Contributor

The problem with the export part is that it won't work if you're booting from a ZFS filesystem. Can't export the pool because the filesystem is in use…

Which is why we have special checks for that in the SYSV scripts…

PS. You forgot the reading of /etc/default/zfs part if that's at all possible in services files…

Also, you need a Signed-off-by: and Closes lines in appropriate commit.

@FransUrbo
Copy link
Contributor

I'm all for having ONE commit for all of it, not one single commit for each file.

@ggzengel
Copy link
Contributor Author

I don't want the 2nd changes here. I prepared it for a later pull request. I have to learn a lot about github.
@FransUrbo Thanks for the info about keywords. How can I reference issues on other repos?

@FransUrbo
Copy link
Contributor

You write the repo owner (zfsonlinux in our case), slash and then the repo, dash and then the issue number.

Something like this (I have an idea what you're thinking of :):

Closes zfsonlinux/pkg-zfs#172

Without the back ticks, this would become: zfsonlinux/pkg-zfs#172

@ggzengel
Copy link
Contributor Author

@FransUrbo I edited the files online on github, because I don't have/want the full repo local.
Every file I change it will produce a commit.

@FransUrbo
Copy link
Contributor

I see what you mean by the last four commits. Those should be in a separate commit, I agree.

What you do is the following:

  1. Make sure your checkout of the master branch is clean and pristine (and up to date).
  2. Create a new branch with a name that shortly reflects the changes you want to make (if it's fixing a specific issue, most of us prefer to use something like issue-XXXX as branch name).
  3. Make your changes, push it and create a pull request.

So for each change (pull request) you want to do, you do these three steps from the beginning. Unfortunately, since you used master to base your pull request on, you'll have to do it all over from the beginning (closing this one and create a new PR).

@ggzengel
Copy link
Contributor Author

@FransUrbo I think to do it again is the best idea, too. Next turn ...

@ggzengel ggzengel closed this Sep 25, 2015
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.

2 participants