/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 network-hooks.d/bridge.conf

  • Committer: Teddy Hogeborn
  • Date: 2009-01-05 23:26:06 UTC
  • mfrom: (237.2.11 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090105232606-2iohqjcsfj076z7i
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:
network-hooks.d/bridge.conf
1
 
## Required
2
 
 
3
 
#BRIDGE=br0
4
 
 
5
 
#PORT_ADDRESSES="00:11:22:33:44:55 11:22:33:44:55:66"
6
 
 
7
 
## Optional
8
 
 
9
 
#IPADDRS="192.0.2.3/24 2001:DB8::aede:48ff:fe71:f6f2/32"
10
 
 
11
 
#ROUTES="192.0.2.0/24 2001:DB8::/32"