/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 initramfs-tools-script

  • Committer: Teddy Hogeborn
  • Date: 2024-09-22 17:38:57 UTC
  • Revision ID: teddy@recompile.se-20240922173857-rfhxneq4207tx9o0
Only use D-Bus when necessary

If *both* "use_dbus" and "zeroconf" are false, by either setting them
to False in mandos.conf or by using the --no-dbus and --no-zeroconf
options (and a port number or socket is specified), then we do not
need to connect to D-Bus at all.

From: Mike Klein <mike@kleinnet.com>
Signed-off-by: Teddy Hogeborn <teddy@recompile.se>

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-script
177
177
        rm -f /conf/conf.d/cryptroot.mandos
178
178
    fi
179
179
elif [ -x /usr/bin/cryptroot-unlock ]; then
180
 
    setsid /lib/mandos/mandos-to-cryptroot-unlock &
 
180
    # Use setsid if available
 
181
    if command -v setsid >/dev/null 2>&1; then
 
182
        setsid /lib/mandos/mandos-to-cryptroot-unlock &
 
183
    else
 
184
        /lib/mandos/mandos-to-cryptroot-unlock &
 
185
    fi
181
186
fi