diff options
Diffstat (limited to 'initramfs-tools/scripts/samizdat')
-rw-r--r-- | initramfs-tools/scripts/samizdat | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat index 8e9d4fa..9d8b846 100644 --- a/initramfs-tools/scripts/samizdat +++ b/initramfs-tools/scripts/samizdat | |||
@@ -62,15 +62,11 @@ mountroot() | |||
62 | if [ "$nbdroot" ]; then | 62 | if [ "$nbdroot" ]; then |
63 | my_configure_networking | 63 | my_configure_networking |
64 | run_nbd_client | 64 | run_nbd_client |
65 | 65 | (. common.sh && . btrfs-create.sh) | |
66 | wait_for_gnupghome_tar | ||
67 | (sleep 5; echo ) & | ||
68 | (. common.sh && . btrfs-create.sh && init_gpg) | ||
69 | fi | 66 | fi |
70 | 67 | ||
71 | bootmenu | 68 | bootmenu |
72 | samizdat_install_udev_rules | 69 | samizdat_install_udev_rules |
73 | bootwait samizdat-gpg | ||
74 | bootwait root-mounted | 70 | bootwait root-mounted |
75 | osname=$(get_os_name) | 71 | osname=$(get_os_name) |
76 | write_resolv_dot_conf | 72 | write_resolv_dot_conf |
@@ -87,19 +83,6 @@ Press alt-f9 for rescue terminal. | |||
87 | EOF | 83 | EOF |
88 | } | 84 | } |
89 | 85 | ||
90 | wait_for_gnupghome_tar() | ||
91 | { | ||
92 | [ -e /gnupghome.tar ] && return | ||
93 | echo -n Waiting to receive GPG keys through the network... > /dev/tty1 | ||
94 | (while ! tftp -g -r gnupghome.tar -l /gnupghome.tar.$$ "$ROOTSERVER" 2>/run/initramfs/samizdat/log/tftp.$$.log; do | ||
95 | sleep 1; | ||
96 | echo -n . > /dev/tty1 | ||
97 | done | ||
98 | mv /gnupghome.tar.$$ /gnupghome.tar) | ||
99 | echo ' done.' > /dev/tty1 | ||
100 | bootdone gnupg-tar | ||
101 | } | ||
102 | |||
103 | samizdat_restart_udev() | 86 | samizdat_restart_udev() |
104 | { | 87 | { |
105 | local LOG_DIR=/run/initramfs/samizdat/log | 88 | local LOG_DIR=/run/initramfs/samizdat/log |