diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-09 10:08:44 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-09 10:08:44 +0200 |
| commit | 94766ad2ba705d3d545b2fa87616ca12c0e301ac (patch) | |
| tree | da8d15d04bcc8029556fb32438346e93b265f36b /src/nspawn | |
| parent | 0fa7d1f5be847d4804eb3bf6a4c10333ea14e0bc (diff) | |
| parent | 38c2ef1d55c034c6e06c25f7eff22a651edc5aec (diff) | |
Merge pull request #1210 from poettering/import-fixes
cgroup fix, nspawn fix, plus change to download .nspawn files in importd
Diffstat (limited to 'src/nspawn')
| -rw-r--r-- | src/nspawn/nspawn-gperf.gperf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn-gperf.gperf b/src/nspawn/nspawn-gperf.gperf index 074b380306..b5127a387c 100644 --- a/src/nspawn/nspawn-gperf.gperf +++ b/src/nspawn/nspawn-gperf.gperf @@ -34,5 +34,5 @@ Network.Interface, config_parse_strv, 0, offsetof(Settings, net Network.MACVLAN, config_parse_strv, 0, offsetof(Settings, network_macvlan) Network.IPVLAN, config_parse_strv, 0, offsetof(Settings, network_ipvlan) Network.VirtualEthernet, config_parse_tristate, 0, offsetof(Settings, network_veth) -Network.Bridge config_parse_string, 0, offsetof(Settings, network_bridge) +Network.Bridge, config_parse_string, 0, offsetof(Settings, network_bridge) Network.Port, config_parse_expose_port, 0, 0 |