Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: fe9cabedf0292a2b09de16e272b968b42c0ac7fe
https://github.com/NixOS/nixpkgs/commit/fe9cabedf0292a2b09de16e272b968b42c0ac7fe
Author: Alexey Shmalko <rasen.d...@gmail.com>
Date: 2016-07-25 (Mon, 25 Jul 2016)
Changed paths:
M nixos/modules/system/etc/setup-etc.pl
Log Message:
-----------
etc: remove obsolete directories
This patch adds handling of a directory becoming a symlink in
/etc. Before this patch, the directory wasn't removed and then
symlinking failed, which caused directory not being updated at all.
The idea for the patch goes to @abbradar at
https://github.com/NixOS/nixpkgs/issues/16978#issuecomment-232921903:
> A heuristic idea for this -- a function `isStatic :: Path -> Bool`:
>
> * if path `/etc/foo` is a file, return True iff it's a symlink to
> `/etc/static/foo`.
> * if path is a directory, return True iff for all items in it `isStatic` is
> True.
>
> On any conflicts, if old path is static, it's safe to replace and/or
> delete stale. Otherwise make a backup and notify the user via a
> journal entry and console output.
The only difference here -- it will not replace user configs.
This also fixes https://github.com/NixOS/nixpkgs/issues/16978.
Commit: 3bb18c68d2b767e53f3f9d90b310ede145315726
https://github.com/NixOS/nixpkgs/commit/3bb18c68d2b767e53f3f9d90b310ede145315726
Author: Wout Mertens <wout.mert...@gmail.com>
Date: 2016-07-26 (Tue, 26 Jul 2016)
Changed paths:
M nixos/modules/system/etc/setup-etc.pl
Log Message:
-----------
Merge pull request #17042 from rasendubi/etc
etc: remove obsolete directories
Compare: https://github.com/NixOS/nixpkgs/compare/3badad811c60...3bb18c68d2b7_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
