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

  • Committer: Teddy Hogeborn
  • Date: 2024-09-08 17:17:22 UTC
  • mto: This revision was merged to the branch mainline in revision 410.
  • Revision ID: teddy@recompile.se-20240908171722-oqkqtp0zto6ze2m6
Do not hardcode directory names; get them from pkg-config

Similarly to the directory for systemd unit files (output of
"pkg-config systemd --variable=systemdsystemunitdir"), the values of
the "tmpfilesdir" and "sysusersdir" variables should not be hardcoded
in debian/mandos.dirs and debian/mandos-client.dirs.  Fix this the
same way as with systemdsystemunitdir; i.e. remove the directories
from the .dirs files, and instead create the directories in override
rules in debian/rules.

* debian/mandos-client.dirs (usr/lib/sysusers.d): Removed.
* debian/mandos.dirs (usr/lib/tmpfiles.d, usr/lib/sysusers.d):
  Removed.
* debian/rules (override_dh_installdirs-indep): Also create
  directories for the "tmpfilesdir" and "sysusersdir" variables from
  pkg-config.
  (override_dh_installdirs-arch): New; create directory for the
  "sysusersdir" variable from pkg-config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos.postinst
27
27
                *:Mandos\ password\ system,,,:/nonexistent:/bin/false)
28
28
                    usermod --login _mandos mandos
29
29
                    groupmod --new-name _mandos mandos
 
30
                    # Reload D-Bus daemon to be aware of the _mandos
 
31
                    # user & group
 
32
                    if [ -x /etc/init.d/dbus ]; then
 
33
                        invoke-rc.d dbus force-reload || :
 
34
                    fi
30
35
                    ;;
31
36
            esac
32
37
        fi
36
41
                --home /nonexistent --no-create-home --group \
37
42
                --disabled-password --gecos "Mandos password system" \
38
43
                _mandos
 
44
            # Reload D-Bus daemon to be aware of the _mandos user &
 
45
            # group
 
46
            if [ -x /etc/init.d/dbus ]; then
 
47
                invoke-rc.d dbus force-reload || :
 
48
            fi
39
49
        elif dpkg --compare-versions "$2" eq 1.7.4-1 \
40
50
                || dpkg --compare-versions "$2" eq "1.7.4-1~bpo8+1"
41
51
        then
50
60
                invoke-rc.d mandos start
51
61
            fi
52
62
        fi
53
 
        # Reload D-Bus daemon to be aware of the _mandos user & group
54
 
        if [ -x /etc/init.d/dbus ]; then
55
 
            invoke-rc.d dbus force-reload || :
56
 
        fi
57
63
        if ! dpkg-statoverride --list "/var/lib/mandos" >/dev/null \
58
64
             2>&1; then
59
65
            chown _mandos:_mandos /var/lib/mandos