diff options
author | Florian Klink <flokli@flokli.de> | 2020-04-30 01:03:18 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2020-04-30 01:47:35 +0200 |
commit | a3082bc6b796f539cbe02bffbb058966acb629b6 (patch) | |
tree | 9995d1f4931f6811a025e06d0b073779d55c9304 /pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch | |
parent | 8882516056f19f4a12fabd70084f4f246db9f30c (diff) | |
download | nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.gz nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.bz2 nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.lz nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.xz nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.zst nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.zip |
systemd: regenerate patches
It seems nix is much more permissive in applying patches than git am. These patches were regenerated by running `git am path/to/nixpkgs/pkgs/os-specific/linux/systemd/*.patch`, and manually running `patch -p1 < path/to/nixpkgs/pkgs/os-specific/linux/systemd/*N.patch` where necessary.
Diffstat (limited to 'pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch')
-rw-r--r-- | pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch new file mode 100644 index 00000000000..c5679bb393c --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -0,0 +1,42 @@ +From 1e2f2f80e106910bbf3fd27438b794937ff3a1a8 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Fri, 12 Apr 2013 13:16:57 +0200 +Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store + +They'll still be remounted read-only. + +https://github.com/NixOS/nixos/issues/126 +--- + src/core/mount.c | 2 ++ + src/shutdown/umount.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/core/mount.c b/src/core/mount.c +index 1c4aefd734..a5553226f8 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -412,6 +412,8 @@ static bool mount_is_extrinsic(Mount *m) { + + if (PATH_IN_SET(m->where, /* Don't bother with the OS data itself */ + "/", /* (strictly speaking redundant: should already be covered by the perpetual flag check above) */ ++ "/nix", ++ "/nix/store", + "/usr", + "/etc")) + return true; +diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c +index 8a5e80eeaa..fab35ed6f3 100644 +--- a/src/shutdown/umount.c ++++ b/src/shutdown/umount.c +@@ -414,6 +414,8 @@ static int delete_dm(dev_t devnum) { + + static bool nonunmountable_path(const char *path) { + return path_equal(path, "/") ++ || path_equal(path, "/nix") ++ || path_equal(path, "/nix/store") + #if ! HAVE_SPLIT_USR + || path_equal(path, "/usr") + #endif +-- +2.26.2 + |