summaryrefslogtreecommitdiff
path: root/initramfs-tools/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'initramfs-tools/scripts')
-rw-r--r--initramfs-tools/scripts/samizdat19
1 files changed, 14 insertions, 5 deletions
diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index 515b724..a42b321 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -8,20 +8,29 @@ mountroot()
8 samizdat_install_udev_rules 8 samizdat_install_udev_rules
9 9
10 if [ "${nbdroot%%,*}" ]; then 10 if [ "${nbdroot%%,*}" ]; then
11 # I guess this isn't getting called otherwise? I don't know why this should 11 (. common.sh
12 # be necessary, but it is. 12 sh /scripts/local-top/nbd >/dev/null 2>&1;
13 sh /scripts/local-top/nbd >/dev/null 2>&1 13 bootdone nbd-script) &
14 fi 14 fi
15 15
16 if keys_via_network; then 16 if ! cdrom_has_keys && keys_via_network; then
17 wait_for_gnupghome_tar "$tftp_key_server" 17 bootwait nbd-script
18 wait_for_gnupghome_tar "$tftp_key_server"
18 fi 19 fi
20
19 bootwait samizdat-gpg 21 bootwait samizdat-gpg
20 bootmenu 22 bootmenu
21 bootwait root-mounted 23 bootwait root-mounted
22 chvt 1 24 chvt 1
23} 25}
24 26
27cdrom_has_keys()
28{
29 [ ! "$BOOTIF" ] || return
30 bootwait samizdat-cdrom
31 [ -d /cdrom/gnupghome ]
32}
33
25# Sets $tftp_key_server or returns false. 34# Sets $tftp_key_server or returns false.
26keys_via_network() 35keys_via_network()
27{ 36{