/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/usplash

  • Committer: Teddy Hogeborn
  • Date: 2009-01-10 02:39:56 UTC
  • mfrom: (257.1.2 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090110023956-o7f5r8af28fmgahw
Fixed warnings on AMD64, thanks to Mooie <mooie@cow.se> for the patch.

* plugins.d/askpass-fifo.c (main): Cast value from TEMP_FAILURE_RETRY
                                   to int, the value the inner
                                   function returns.
* plugins.d/mandos-client.c (init_gpgme): - '' -
  (start_mandos_communication): New variable "ssize_t sret"; used to
                                store return value from
                                "gnutls_record_recv".  Also cast value
                                from TEMP_FAILURE_RETRY as above.
* plugins.d/usplash.c (usplash_write): New variable "ssize_t sret";
                                       used to store return value from
                                       "write".

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/bin/sh -e
2
 
 
3
 
# If not on a tty, then get rid of possibly disrupting stderr output
4
 
if ! tty -s; then
5
 
    exec 2>/dev/null
6
 
fi
7
 
 
8
 
test -x /sbin/usplash
9
 
 
10
 
usplash="`pidof usplash -o $$`"
11
 
test -n "$usplash"
12
 
 
13
 
# We get some variables from cryptsetup:
14
 
# $cryptsource  the device node, like "/dev/sda3"
15
 
# $crypttarget  the device mapper name, like "sda3_crypt".
16
 
 
17
 
prompt="Enter passphrase to unlock"
18
 
if [ -n "$crypttarget" ]; then
19
 
    prompt="$prompt the disk $crypttarget"
20
 
fi
21
 
if [ -n "$cryptsource" ]; then
22
 
    prompt="$prompt ($cryptsource)"
23
 
fi
24
 
 
25
 
splash_input_password(){
26
 
    test -p /dev/.initramfs/usplash_outfifo || return 1
27
 
    /sbin/usplash_write "INPUTQUIET $1" || return 1
28
 
    cat /dev/.initramfs/usplash_outfifo 2> /dev/null || return 1
29
 
}
30
 
 
31
 
# Usplash keeps waiting for input even if some other plugin provided
32
 
# the password, so we must kill it
33
 
trap "kill -TERM $usplash; sleep 2; kill -KILL $usplash; 
34
 
        kill -TERM $$" TERM HUP
35
 
 
36
 
password="`splash_input_password \"$prompt: \" password`"
37
 
 
38
 
trap - TERM
39
 
 
40
 
/sbin/usplash_write "TIMEOUT 15"
41
 
 
42
 
echo -n "$password"