diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-25 20:35:19 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-25 20:35:19 +0200 |
| commit | 679136e25258760f9991cdbb8d26440e666daf78 (patch) | |
| tree | 6675bdf0983876aa26417101492a5c54e30efcc3 /pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch | |
| parent | 7a3be9661438e1e59592fd3fbc7198b88842d1cd (diff) | |
| parent | bef20b38efca840135d7f174f5044d098a7deca2 (diff) | |
| download | nixpkgs-679136e25258760f9991cdbb8d26440e666daf78.tar nixpkgs-679136e25258760f9991cdbb8d26440e666daf78.tar.gz nixpkgs-679136e25258760f9991cdbb8d26440e666daf78.tar.bz2 nixpkgs-679136e25258760f9991cdbb8d26440e666daf78.tar.lz nixpkgs-679136e25258760f9991cdbb8d26440e666daf78.tar.xz nixpkgs-679136e25258760f9991cdbb8d26440e666daf78.tar.zst nixpkgs-679136e25258760f9991cdbb8d26440e666daf78.zip | |
Merge staging-next into staging
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 | 22 |
1 files changed, 11 insertions, 11 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 index 4f94cb465d4..c52a13c9a41 100644 --- 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 @@ -1,4 +1,4 @@ -From bdd3ff777dd8253ff5732118dd6de0fa9a9b95fe Mon Sep 17 00:00:00 2001 +From e5b2b1e90d055068936336f6f01639bcde251b96 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 @@ -7,18 +7,18 @@ They'll still be remounted read-only. https://github.com/NixOS/nixos/issues/126 --- - src/core/mount.c | 2 ++ - src/shutdown/umount.c | 2 ++ + src/shared/fstab-util.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) */ +diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c +index b19127be09..f9adca1100 100644 +--- a/src/shared/fstab-util.c ++++ b/src/shared/fstab-util.c +@@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) { + /* Don't bother with the OS data itself */ + if (PATH_IN_SET(mount, + "/", + "/nix", + "/nix/store", "/usr", |