/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: 2014-03-23 20:48:58 UTC
  • Revision ID: teddy@recompile.se-20140323204858-l1x3aiick21oog4y
Improve error message when working around Debian bug #633582.

* plugins-runner.c (main): Improve error message when failing to work
                           around Debian bug #633582.  Also simplify
                           code to always use execve().

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos.postinst
34
34
                --home /nonexistent --no-create-home --group \
35
35
                --disabled-password --gecos "Mandos password system" \
36
36
                _mandos
37
 
        elif dpkg --compare-versions "$2" eq 1.7.4-1 \
38
 
                || dpkg --compare-versions "$2" eq "1.7.4-1~bpo8+1"
39
 
        then
40
 
            start=no
41
 
            if ! [ -f /var/lib/mandos/clients.pickle ]; then
42
 
                invoke-rc.d mandos stop
43
 
                start=yes
44
 
            fi
45
 
            chown _mandos:_mandos /var/lib/mandos/clients.pickle \
46
 
                  2>/dev/null || :
47
 
            if [ "$start" = yes ]; then
48
 
                invoke-rc.d mandos start
49
 
            fi
50
 
        fi
51
 
        if ! dpkg-statoverride --list "/var/lib/mandos" >/dev/null \
52
 
             2>&1; then
53
 
            chown _mandos:_mandos /var/lib/mandos
54
 
            chmod u=rwx,go= /var/lib/mandos
55
 
        fi
 
37
        fi
 
38
        chown _mandos:_mandos /var/lib/mandos
56
39
        ;;
57
40
    
58
41
    abort-upgrade|abort-deconfigure|abort-remove)
68
51
# "avahi-daemon") in its /etc/init.d script header.  To make
69
52
# insserv(8) happy, we edit our /etc/init.d script header to contain
70
53
# the correct string before the code added by dh_installinit calls
71
 
# update.rc-d, which calls insserv.
 
54
# update.rd-c, which calls insserv.
72
55
avahi_version="`dpkg-query --showformat='${Version}' --show avahi-daemon`"
73
56
if dpkg --compare-versions "$avahi_version" le 0.6.31-2; then
74
57
    sed --in-place --expression='/^### BEGIN INIT INFO$/,/^### END INIT INFO$/s/^\(# Required-\(Stop\|Start\):.*avahi\)-daemon\>/\1/g' /etc/init.d/mandos