28e55bce8c
Some of Andi's patches have been upstreamed, so we don't need to apply them ourselves any more.
32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
From 06a8dbb65584b6f705fee8a486f32dab12f72082 Mon Sep 17 00:00:00 2001
|
|
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
|
Date: Tue, 8 Jan 2013 15:46:30 +0100
|
|
Subject: [PATCH 01/19] Start device units for uninitialised encrypted devices
|
|
|
|
This is necessary because the NixOS 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...)
|
|
---
|
|
rules.d/99-systemd.rules.in | 4 ----
|
|
1 file changed, 4 deletions(-)
|
|
|
|
diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in
|
|
index 25b8a590a6..d18999ea87 100644
|
|
--- a/rules.d/99-systemd.rules.in
|
|
+++ b/rules.d/99-systemd.rules.in
|
|
@@ -17,10 +17,6 @@ SUBSYSTEM=="ubi", TAG+="systemd"
|
|
SUBSYSTEM=="block", TAG+="systemd"
|
|
SUBSYSTEM=="block", ACTION=="add", 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", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
|
|
-
|
|
# add symlink to GPT root disk
|
|
SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root"
|
|
SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks"
|
|
--
|
|
2.33.0
|
|
|