summaryrefslogtreecommitdiff
path: root/initramfs-tools/scripts/samizdat
diff options
context:
space:
mode:
Diffstat (limited to 'initramfs-tools/scripts/samizdat')
-rw-r--r--initramfs-tools/scripts/samizdat11
1 files changed, 9 insertions, 2 deletions
diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index 1591883..0c511e8 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -6,10 +6,10 @@ mountroot()
6 6
7 samizdat_install_udev_rules 7 samizdat_install_udev_rules
8 mkfifo "$MENUFIFO" 8 mkfifo "$MENUFIFO"
9 sh /scripts/local-top/nbd >/dev/null 2>&1 & # I guess this isn't getting called otherwise?
10 9
10 # Note: this blocks waiting for the network
11 if [ "${nbdroot%%,*}" ]; then 11 if [ "${nbdroot%%,*}" ]; then
12 wait_for_gnupghome_tar 12 try_nbd
13 fi 13 fi
14 14
15 bootmenu 15 bootmenu
@@ -17,6 +17,13 @@ mountroot()
17 chvt 1 17 chvt 1
18} 18}
19 19
20try_nbd()
21{
22 sh /scripts/local-top/nbd >/dev/null 2>&1 & # I guess this isn't getting called otherwise?
23 wait_for_gnupghome_tar
24 (. common.sh && force_grok_block)
25}
26
20wait_for_gnupghome_tar() 27wait_for_gnupghome_tar()
21{ 28{
22 [ -e /gnupghome.tar ] && return 29 [ -e /gnupghome.tar ] && return