summaryrefslogtreecommitdiff
path: root/initramfs-tools
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2020-08-24 08:54:48 -0400
committerAndrew Cady <d@jerkface.net>2020-08-24 08:54:48 -0400
commit9d7395ae0fe42bb45e1478513a2d7e9db257db79 (patch)
tree55f37e169f800bff337fd999ecf21fdfb1a3c86b /initramfs-tools
parent5865c0b28e2dd4d49ff5e281410413677e299aa1 (diff)
code cleanup
Diffstat (limited to 'initramfs-tools')
-rw-r--r--initramfs-tools/scripts/samizdat12
1 files changed, 2 insertions, 10 deletions
diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index ddcb64c..51f7cec 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -30,6 +30,8 @@ mountroot()
30 bootdone nbd-script) 30 bootdone nbd-script)
31 31
32 wait_for_gnupghome_tar 32 wait_for_gnupghome_tar
33 (sleep 5; echo ) &
34 (. common.sh && . btrfs-create.sh && init_gpg)
33 fi 35 fi
34 36
35 bootmenu 37 bootmenu
@@ -44,26 +46,16 @@ mountroot()
44 chvt 1 46 chvt 1
45} 47}
46 48
47cdrom_has_keys()
48{
49 [ ! "$BOOTIF" ] || return
50 bootwait samizdat-cdrom
51 [ -d /cdrom/gnupghome ]
52}
53
54wait_for_gnupghome_tar() 49wait_for_gnupghome_tar()
55{ 50{
56 [ -e /gnupghome.tar ] && return 51 [ -e /gnupghome.tar ] && return
57 echo -n Waiting to receive GPG keys through the network... > /dev/tty1 52 echo -n Waiting to receive GPG keys through the network... > /dev/tty1
58 my_configure_networking
59 (while ! tftp -g -r gnupghome.tar -l /gnupghome.tar.$$ "$ROOTSERVER" 2>/run/initramfs/samizdat/log/tftp.$$.log; do 53 (while ! tftp -g -r gnupghome.tar -l /gnupghome.tar.$$ "$ROOTSERVER" 2>/run/initramfs/samizdat/log/tftp.$$.log; do
60 sleep 1; 54 sleep 1;
61 echo -n . > /dev/tty1 55 echo -n . > /dev/tty1
62 done 56 done
63 mv /gnupghome.tar.$$ /gnupghome.tar) 57 mv /gnupghome.tar.$$ /gnupghome.tar)
64 echo ' done.' > /dev/tty1 58 echo ' done.' > /dev/tty1
65 (sleep 5; echo ) &
66 (. common.sh && . btrfs-create.sh && init_gpg)
67} 59}
68 60
69samizdat_restart_udev() 61samizdat_restart_udev()