summary refs log tree commit diff
diff options
context:
space:
mode:
authorobadz <obadz-git@obadz.com>2016-08-16 02:46:13 +0100
committerobadz <obadz-git@obadz.com>2016-08-16 02:47:08 +0100
commit1759825b34cad43f8925aa015c80f56a57eb12e6 (patch)
tree3b8b5849022db2c7c182f51ff77dd2a1316ab033
parent9adad8612b082bcbae30c81678a04b79a44079a4 (diff)
downloadnixpkgs-1759825b34cad43f8925aa015c80f56a57eb12e6.tar
nixpkgs-1759825b34cad43f8925aa015c80f56a57eb12e6.tar.gz
nixpkgs-1759825b34cad43f8925aa015c80f56a57eb12e6.tar.bz2
nixpkgs-1759825b34cad43f8925aa015c80f56a57eb12e6.tar.lz
nixpkgs-1759825b34cad43f8925aa015c80f56a57eb12e6.tar.xz
nixpkgs-1759825b34cad43f8925aa015c80f56a57eb12e6.tar.zst
nixpkgs-1759825b34cad43f8925aa015c80f56a57eb12e6.zip
nixos/tests/ecryptfs: placate some commands causing many builds failure
These commands shouldn't have to be here in the first place as ecryptfs
homes should be automatically unmounted during logoff.
-rw-r--r--nixos/tests/ecryptfs.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/ecryptfs.nix b/nixos/tests/ecryptfs.nix
index eceb25a0dea..db800c7bb2c 100644
--- a/nixos/tests/ecryptfs.nix
+++ b/nixos/tests/ecryptfs.nix
@@ -30,7 +30,7 @@ import ./make-test.nix ({ pkgs, ... }:
     $machine->sleep(2);
 
     # Why do I need to do this??
-    $machine->succeed("su alice -c ecryptfs-umount-private");
+    $machine->succeed("su alice -c ecryptfs-umount-private || true");
     $machine->sleep(1);
     $machine->fail("mount | grep ecryptfs"); # check that encrypted home is not mounted
 
@@ -53,7 +53,7 @@ import ./make-test.nix ({ pkgs, ... }:
     $machine->sleep(2);
 
     # Why do I need to do this??
-    $machine->succeed("su alice -c ecryptfs-umount-private");
+    $machine->succeed("su alice -c ecryptfs-umount-private || true");
     $machine->sleep(1);
 
     # Check that the filesystem is not accessible