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

doas: enable timestamp by default and set pamdir #88028

Merged
merged 1 commit into from May 17, 2020
Merged

Conversation

@cole-h
Copy link
Member

cole-h commented May 17, 2020

  • --with-timestamp enables the usage of the persist setting in
    doas.conf. It is possible some people might not want this, so the flag
    withTimestamp was added to control this.
  • --pamdir copies the PAM files to $out/etc/pam.d. This may or may
    not have a use in the future, but it removes a some errors from the
    build (when it tries to copy these files to /etc/pam.d).
Motivation for this change

The persist setting from nixos/doas will not actually work because you must opt in to timestamps (its presence when this is disabled will be silently ignored).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
* `--with-timestamp` enables the usage of the `persist` setting in
`doas.conf`. It is possible some people might not want this, so the flag
`withTimestamp` was added to control this.
* `--pamdir` copies the PAM files to `$out/etc/pam.d`. This may or may
not have a use in the future, but it removes a some errors from the
build (when it tries to copy these files to /etc/pam.d).
@cole-h cole-h requested a review from adisbladis May 17, 2020
@adisbladis
Copy link
Member

adisbladis commented May 17, 2020

@GrahamcOfBorg test doas

@adisbladis
Copy link
Member

adisbladis commented May 17, 2020

@adisbladis adisbladis merged commit a78d9d6 into NixOS:master May 17, 2020
1 of 2 checks passed
1 of 2 checks passed
tests.doas on x86_64-linux
Details
tests.doas on aarch64-linux Success
Details
@cole-h cole-h deleted the cole-h:doas branch May 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.