/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: 2008-08-29 05:53:59 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080829055359-wkdasnyxtylmnxus
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
                        "&COMMANDNAME;".

* plugins.d/password-prompt.c (main): Improved some documentation
                                      strings.  Do perror() of
                                      tcgetattr() fails.  Add debug
                                      output if interrupted by signal.
                                      Loop over write() instead of
                                      using fwrite() when outputting
                                      password.  Add debug output if
                                      getline() returns 0, unless it
                                      was caused by a signal.  Add
                                      exit status code to debug
                                      output.

* plugins.d/password-prompt.xml: Changed all single quotes to double
                                 quotes for consistency.  Removed
                                 <?xml-stylesheet>.
  (ENTITY TIMESTAMP): New.  Automatically updated by Emacs time-stamp
                      by using Emacs local variables.
  (/refentry/refentryinfo/title): Changed to "Mandos Manual".
  (/refentry/refentryinfo/productname): Changed to "Mandos".
  (/refentry/refentryinfo/date): New; set to "&TIMESTAMP;".
  (/refentry/refentryinfo/copyright): Split copyright holders.
  (/refentry/refnamediv/refpurpose): Improved wording.
  (SYNOPSIS): Fix to use correct markup.  Add short options.
  (DESCRIPTION, OPTIONS): Improved wording.
  (OPTIONS): Improved wording.  Use more correct markup.  Document
             short options.
  (EXIT STATUS): Add text.
  (ENVIRONMENT): Document use of "cryptsource" and "crypttarget".
  (FILES): REMOVED.
  (BUGS): Add text.
  (EXAMPLE): Added some examples.
  (SECURITY): Added text.
  (SEE ALSO): Remove reference to mandos(8).  Add reference to
              crypttab(5).

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"