/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 debian/mandos.postinst

  • Committer: Teddy Hogeborn
  • Date: 2019-07-27 10:11:45 UTC
  • Revision ID: teddy@recompile.se-20190727101145-jnpbpf8220gldbcd
Add dracut(8) support

Add support for the dracut(8) system for generating initramfs image
files; dracut is an alternative to the "initramfs-tools" package.

* .bzrignore (dracut-module/password-agent): Ignore new binary file.
* dracut-module: New directory for the dracut module.
* INSTALL (Prerequisites/Libraries/Mandos Client): Add dracut as an
                                                   alternative to
                                                   initramfs-tools,
                                                   and also add GLib.
* Makefile (DRACUTMODULE, GLIB_CFLAGS, GLIB_LIBS): New.
  (CPROGS): Add "dracut-module/password-agent".
  (DOCS): Add "dracut-module/password-agent.8mandos".
  (dracut-module/password-agent.8mandos): New.
  (dracut-module/password-agent.8mandos.xhtml): - '' -
  (dracut-module/password-agent): - '' -
  (check): Add command to run tests of password-agent(8mandos).
  (install-client-nokey): Also install the dracut module directory,
                          its files, and the password-agent(8mandos)
                          manual page.
  (install-client): To update the initramfs image file, run
                    update-initramfs or dracut depending on what is
                    installed.
  (uninstall-client): - '' - and also uninstall the the files in the
                      dracut module directory, that directory itself,
                      and the password-agent(8mandos) manual page.
* debian/control (Build-Depends): Add "libglib2.0-dev (>=2.40)".
  (Package: mandos-client/Depends): Add "dracut (>= 044+241-3)" as an
                                    alternative dependency to
                                    initramfs-tools.
  (Package: mandos-client/Conflicts): New; set to
                                      "dracut-config-generic".
  (debian/mandos-client.README.Debian): Document alternative commands
                                        to update the initramfs image
                                        for when dracut is used.
* debian/mandos-client.postinst (update_initramfs): Use alternative
                                                    commands to update
                                                    the initramfs
                                                    image for when
                                                    dracut is used.
* debian/tests/control (password-agent, password-agent-suid): Add two
                                                              new tests.
* dracut-module/ask-password-mandos.path: New.
* dracut-module/ask-password-mandos.service: - '' -
* dracut-module/cmdline-mandos.sh: - '' -
* dracut-module/module-setup.sh: - '' -
* dracut-module/password-agent.c: - '' -
* dracut-module/password-agent.xml: - '' -
* initramfs-unpack: Use the dracut "skipcpio" command, if available.
                    Also be more flexible and try hard to detect where
                    compressed data starts.
* plugins.d/mandos-client.xml (SECURITY): Be more precise that the
                                          mandos-client binary might
                                          not always be setuid, but
                                          that the program assumes
                                          that it has been started
                                          that way.
* plugins.d/password-prompt.c: Add new "--prompt" option.
  (conflict_detection): First try to detect the new PID file of
                        plymouth.
  (main): Define and use new "prompt" variable.
* plugins.d/password-prompt.xml (SYNOPSIS): Show new --prompt option.
  (DESCRIPTION): Describe new behavior of looking for plymouth PID
                 file.
  (OPTIONS): Document new "--prompt" option.
  (ENVIRONMENT): Clarify that the CRYPTTAB_SOURCE and CRYPTTAB_NAME
                 environment variables are not used if the --prompt
                 option is used.  Remove unnecessarily specific
                 details about where the CRYPTTAB_SOURCE and
                 CRYPTTAB_NAME comes from, since this can now be
                 either initramfs-tools or dracut.
  (SEE ALSO): Remove superfluous crypttab(5) reference, and add commas
              to separate the other references.
* plugins.d/plymouth.c: Add new "--prompt" and "--debug" options.
  (debug): New global flag.
  (fprintf_plus): New function, used for debug output.
  (exec_and_wait): Add extra "const" to "argv" argument.
  (main): Define and use new "prompt" variable.  Add debug output.
  (main/options, main/parse_opt): New; used to parse options.
* plugins.d/plymouth.xml (SYNOPSIS): Show new options.
  (OPTIONS): Document new options.
  (ENVIRONMENT): Clarify that the cryptsource and crypttarget
                 environment variables are not used if the --prompt
                 option is used.  Remove unnecessarily specific
                 details about where the cryptsource and crypttarget
                 comes from, since this can now be either
                 initramfs-tools or dracut.
  (EXAMPLE): Add an example using an option.
  (SEE ALSO): Remove superfluous crypttab(5) reference.
* plugins.d/splashy.xml (ENVIRONMENT): Clarify that the cryptsource
                                       and crypttarget environment
                                       variables are not used if the
                                       --prompt option is used.
                                       Remove unnecessarily specific
                                       details about where the
                                       cryptsource and crypttarget
                                       comes from, since this can now
                                       be either initramfs-tools or
                                       dracut.
  (SEE ALSO): Remove superfluous crypttab(5) reference.
* plugins.d/usplash.xml (ENVIRONMENT): Clarify that the cryptsource
                                       and crypttarget environment
                                       variables are not used if the
                                       --prompt option is used.
                                       Remove unnecessarily specific
                                       details about where the
                                       cryptsource and crypttarget
                                       comes from, since this can now
                                       be either initramfs-tools or
                                       dracut.
  (SEE ALSO): Remove superfluous crypttab(5) reference.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos.postinst
15
15
# If prerm fails during replacement due to conflict:
16
16
#       <postinst> abort-remove in-favour <new-package> <version>
17
17
 
 
18
. /usr/share/debconf/confmodule
 
19
 
18
20
set -e
19
21
 
20
22
case "$1" in
34
36
                --home /nonexistent --no-create-home --group \
35
37
                --disabled-password --gecos "Mandos password system" \
36
38
                _mandos
 
39
        elif dpkg --compare-versions "$2" eq 1.7.4-1 \
 
40
                || dpkg --compare-versions "$2" eq "1.7.4-1~bpo8+1"
 
41
        then
 
42
            start=no
 
43
            if ! [ -f /var/lib/mandos/clients.pickle ]; then
 
44
                invoke-rc.d mandos stop
 
45
                start=yes
 
46
            fi
 
47
            chown _mandos:_mandos /var/lib/mandos/clients.pickle \
 
48
                  2>/dev/null || :
 
49
            if [ "$start" = yes ]; then
 
50
                invoke-rc.d mandos start
 
51
            fi
 
52
        fi
 
53
        if ! dpkg-statoverride --list "/var/lib/mandos" >/dev/null \
 
54
             2>&1; then
 
55
            chown _mandos:_mandos /var/lib/mandos
 
56
            chmod u=rwx,go= /var/lib/mandos
 
57
        fi
 
58
 
 
59
        if dpkg --compare-versions "$2" eq "1.8.0-1" \
 
60
                || dpkg --compare-versions "$2" eq "1.8.0-1~bpo9+1"; then
 
61
            if grep --quiet --regexp='^[[:space:]]*key_id[[:space:]]*=[[:space:]]*[Ee]3[Bb]0[Cc]44298[Ff][Cc]1[Cc]149[Aa][Ff][Bb][Ff]4[Cc]8996[Ff][Bb]92427[Aa][Ee]41[Ee]4649[Bb]934[Cc][Aa]495991[Bb]7852[Bb]855[[:space:]]*$' /etc/mandos/clients.conf; then
 
62
                sed --in-place \
 
63
                    --expression='/^[[:space:]]*key_id[[:space:]]*=[[:space:]]*[Ee]3[Bb]0[Cc]44298[Ff][Cc]1[Cc]149[Aa][Ff][Bb][Ff]4[Cc]8996[Ff][Bb]92427[Aa][Ee]41[Ee]4649[Bb]934[Cc][Aa]495991[Bb]7852[Bb]855[[:space:]]*$/d' \
 
64
                    /etc/mandos/clients.conf
 
65
                invoke-rc.d mandos restart
 
66
                db_version 2.0
 
67
                db_fset mandos/removed_bad_key_ids seen false
 
68
                db_reset mandos/removed_bad_key_ids
 
69
                db_input critical mandos/removed_bad_key_ids || true
 
70
                db_go
 
71
                db_stop
 
72
            fi
 
73
        fi
 
74
 
 
75
        gnutls_version=$(dpkg-query --showformat='${Version}' \
 
76
                                    --show libgnutls30 \
 
77
                                    2>/dev/null || :)
 
78
        if [ -n "$gnutls_version" ] \
 
79
               && dpkg --compare-versions $gnutls_version ge 3.6.6; then
 
80
            db_version 2.0
 
81
            db_input critical mandos/key_id || true
 
82
            db_go
 
83
            db_stop
37
84
        fi
38
85
        ;;
39
 
 
 
86
    
40
87
    abort-upgrade|abort-deconfigure|abort-remove)
41
88
        ;;
42
 
 
 
89
    
43
90
    *)
44
91
        echo "$0 called with unknown argument '$1'" 1>&2
45
92
        exit 1
46
93
        ;;
47
94
esac
48
95
 
 
96
# Avahi version 0.6.31-2 and older provides "avahi" (instead of
 
97
# "avahi-daemon") in its /etc/init.d script header.  To make
 
98
# insserv(8) happy, we edit our /etc/init.d script header to contain
 
99
# the correct string before the code added by dh_installinit calls
 
100
# update.rc-d, which calls insserv.
 
101
avahi_version="`dpkg-query --showformat='${Version}' --show avahi-daemon`"
 
102
if dpkg --compare-versions "$avahi_version" le 0.6.31-2; then
 
103
    sed --in-place --expression='/^### BEGIN INIT INFO$/,/^### END INIT INFO$/s/^\(# Required-\(Stop\|Start\):.*avahi\)-daemon\>/\1/g' /etc/init.d/mandos
 
104
fi
 
105
 
49
106
#DEBHELPER#
50
107
 
51
108
exit 0