/mandos/release

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

« back to all changes in this revision

Viewing changes to plugins.d/usplash

  • Committer: Teddy Hogeborn
  • Date: 2016-02-28 03:01:43 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 331.
  • Revision ID: teddy@recompile.se-20160228030143-i6w90r7wzkvlx9kq
Stop using python-gnutls.  Use GnuTLS 3.3 or later directly.

* INSTALL: Document dependency on GnuTLS 3.3 and remove dependency on
          Python-GnuTLS.

* debian/control (Source: mandos/Build-Depends): Add (>= 3.3.0) to
                                                 "libgnutls28-dev" and
                                                 "gnutls-dev".
  (Source: mandos/Build-Depends-Indep): Remove "python2.7-gnutls".
  (Package: mandos/Depends): Remove "python-gnutls" and
                             "python2.7-gnutls", add "libgnutls28-dev
                             (>= 3.3.0) | libgnutls30 (>= 3.3.0)"
* mandos: Remove imports of "gnutls" and all submodules.
  (GnuTLS, gnutls): New; simulate a "gnutls" module.  Change all
                    callers to match new shorter names.

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"