diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2020-11-01 15:35:11 +0100 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-12-02 23:40:04 +0100 |
| commit | ef050bc3d18d4c72da4ba238fccbf0d82565eeb9 (patch) | |
| tree | 9fde2716e10cf1216538e2f75bf0aa5a401fde77 /pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch | |
| parent | b83ed81c33567d2dc6f28d4cba8fd99e8394d282 (diff) | |
| download | nixpkgs-ef050bc3d18d4c72da4ba238fccbf0d82565eeb9.tar nixpkgs-ef050bc3d18d4c72da4ba238fccbf0d82565eeb9.tar.gz nixpkgs-ef050bc3d18d4c72da4ba238fccbf0d82565eeb9.tar.bz2 nixpkgs-ef050bc3d18d4c72da4ba238fccbf0d82565eeb9.tar.lz nixpkgs-ef050bc3d18d4c72da4ba238fccbf0d82565eeb9.tar.xz nixpkgs-ef050bc3d18d4c72da4ba238fccbf0d82565eeb9.tar.zst nixpkgs-ef050bc3d18d4c72da4ba238fccbf0d82565eeb9.zip | |
systemd: 246.6 -> 247-rc2
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 | 10 |
1 files changed, 5 insertions, 5 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 7c025cbb7d7..1f3a1b64684 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 139c420de62e078182eaf48b541c4b912d445fd9 Mon Sep 17 00:00:00 2001 +From ab3dab997695db5346f8efbf8566ac96612f0c6e 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 @@ -12,7 +12,7 @@ https://github.com/NixOS/nixos/issues/126 2 files changed, 4 insertions(+) diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c -index 806dda8475..0220741c91 100644 +index 292b97cd69..791b8e6b7e 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) { @@ -25,10 +25,10 @@ index 806dda8475..0220741c91 100644 "/etc")) return true; diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c -index 8a5e80eeaa..fab35ed6f3 100644 +index 3a72a13e1a..541320dc9d 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c -@@ -414,6 +414,8 @@ static int delete_dm(dev_t devnum) { +@@ -500,6 +500,8 @@ static int delete_md(MountPoint *m) { static bool nonunmountable_path(const char *path) { return path_equal(path, "/") @@ -38,5 +38,5 @@ index 8a5e80eeaa..fab35ed6f3 100644 || path_equal(path, "/usr") #endif -- -2.28.0 +2.29.2 |