forked from mirrors/nixpkgs
Work around timeouts after creating a LUKS device
This commit is contained in:
parent
3aae32372a
commit
dee64b4c2c
22
pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch
Normal file
22
pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch
Normal file
|
@ -0,0 +1,22 @@
|
|||
Do start device units for uninitialised encrypted devices, because the
|
||||
service that initialises the filesystem depends on the appearance of
|
||||
the device unit. Also, this makes more sense to me: the device is
|
||||
ready; it's the filesystem that's not, but taking care of that is the
|
||||
responsibility of the mount unit. (However, this ignores the fsck
|
||||
unit, so it's not perfect...)
|
||||
|
||||
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
|
||||
index d17bdd9..040b10e 100644
|
||||
--- a/rules/99-systemd.rules.in
|
||||
+++ b/rules/99-systemd.rules.in
|
||||
@@ -14,10 +14,6 @@ KERNEL=="vport*", TAG+="systemd"
|
||||
SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd"
|
||||
SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"
|
||||
|
||||
-# Ignore encrypted devices with no identified superblock on it, since
|
||||
-# we are probably still calling mke2fs or mkswap on it.
|
||||
-SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
|
||||
-
|
||||
# Ignore raid devices that are not yet assembled and started
|
||||
SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0"
|
||||
SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0"
|
|
@ -13,7 +13,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0cgnnl6kqaz3als5y9g8jvsvbs4c8ccp0vl4s1g8rwk69w2cwxd2";
|
||||
};
|
||||
|
||||
patches = [ ./reexec.patch ./ignore-duplicates.patch ./fix-device-aliases.patch ];
|
||||
patches =
|
||||
[ ./reexec.patch
|
||||
./ignore-duplicates.patch
|
||||
./fix-device-aliases.patch
|
||||
./crypt-devices-are-ready.patch
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig intltool gperf libcap dbus kmod xz pam acl
|
||||
|
|
Loading…
Reference in a new issue