/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

Merge from trunk, but disable the unfinished D-Bus feature:

* Makefile (PROGS): Removed "mandos-list".
  (mandos-list): Removed.
* mandos (main): Hide "--no-dbus" option.  Hard-code "use_dbus" to
                 "False".
* mandos-list: Removed.
* mandos.xml (SYNOPSIS): Removed "--no-dbus" option.
  (OPTIONS): - '' -
  (D-BUS INTERFACE): Removed section.

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
     ;;
25
25
esac
26
26
 
27
 
for param in `cat /proc/cmdline`; do
28
 
    case "$param" in
29
 
        mandos=off) exit 0;;
30
 
    esac
31
 
done
32
 
 
33
27
chmod a=rwxt /tmp
34
28
 
35
29
test -w /conf/conf.d/cryptroot