/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: 2010-09-12 02:51:19 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100912025119-7vvpqofpnbxf7i22
Rename all D-Bus properties to conform to D-Bus naming conventions;
all programs changed.

Also rename client setting "approved_delay" to "approval_delay", and
"approved_duration" to "approval_duration"; all programs changed.

* mandos (ClientDBus.NeedApproval): Bug fix: send an UInt64, not a
                                    float.
  (ClientDBus.ApprovedByDefault_dbus_property,
  ClientDBus.ApprovalDelay_dbus_property,
  ClientDBus.ApprovalDuration_dbus_property): Bug fix: send
                                              PropertyChanged signal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/usplash
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"