[arch-projects] [RFC initscripts 29/29] Skip cryptos tagged as %early

[Matthew Monaco]

From: Matthew Monaco <matthew.monaco at 0x01b.net>

We'll have the late hook in the initrd automatically map all volumes
with an %early tag. Skipping them here is up for discussion though, as
they should be skipped if they're mapped anyway.

What should the procedure be if we're in rc.sysinit, and an %early
volume is not mounted for whatever reason?
---
 rc.sysinit |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rc.sysinit b/rc.sysinit
index 270f384..be51dbb 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -153,7 +153,7 @@ activate_cryptos() {
 }
 
 # Map any unmapped encrypted volumes in crypttab, non-random
-activate_cryptos -O \!%random
+activate_cryptos -O '!%early,!%random'
 
 # Check filesystems
 run_hook sysinit_prefsck
@@ -190,7 +190,7 @@ status "Initializing Random Seed" load_random_seed
 status "Storing new Random Seed" store_random_seed
 
 # Map any unmapped encrypted volumes in crypttab, only random
-activate_cryptos -O %random
+activate_cryptos -O '!%early,%random'
 
 status "Activating Swap" swapon -a
 
-- 
1.7.10.2