merge: add settings plugin for reading iBFT configuration (bgo #734009) (rh #990480)

System Internals / NetworkManager - Dan Williams [redhat.com] - 29 August 2014 18:51 UTC

fc9c1f1 merge: add settings plugin for reading iBFT configuration (bgo #734009) (rh #990480)

.gitignore | 1 +
configure.ac | 2 +
include/nm-test-utils.h | 46 +
po/POTFILES.in | 1 +
src/nm-manager.c | 15 +-
src/settings/plugins/Makefile.am | 2 +-
src/settings/plugins/ibft/Makefile.am | 40 +
src/settings/plugins/ibft/errors.c | 34 +
src/settings/plugins/ibft/errors.h | 29 +
src/settings/plugins/ibft/nm-ibft-connection.c | 65 +
src/settings/plugins/ibft/nm-ibft-connection.h | 50 +
src/settings/plugins/ibft/plugin.c | 211 ++++
src/settings/plugins/ibft/plugin.h | 47 +
src/settings/plugins/ibft/reader.c | 565 +++++++++
src/settings/plugins/ibft/reader.h | 36 +
src/settings/plugins/ibft/tests/Makefile.am | 50 +
.../plugins/ibft/tests/iscsiadm-test-bad-dns1 | 21 +
.../plugins/ibft/tests/iscsiadm-test-bad-dns2 | 21 +
.../plugins/ibft/tests/iscsiadm-test-bad-entry | 20 +
.../plugins/ibft/tests/iscsiadm-test-bad-gateway | 21 +
.../plugins/ibft/tests/iscsiadm-test-bad-ipaddr | 21 +
.../plugins/ibft/tests/iscsiadm-test-bad-record | 18 +
src/settings/plugins/ibft/tests/iscsiadm-test-dhcp | 33 +
.../plugins/ibft/tests/iscsiadm-test-static | 35 +
src/settings/plugins/ibft/tests/iscsiadm-test-vlan | 19 +
src/settings/plugins/ibft/tests/test-ibft.c | 295 +++++
.../plugins/ifcfg-rh/nm-ifcfg-connection.c | 4 +-
src/settings/plugins/ifcfg-rh/reader.c | 295 +----
src/settings/plugins/ifcfg-rh/reader.h | 1 -
src/settings/plugins/ifcfg-rh/tests/Makefile.am | 10 -
.../plugins/ifcfg-rh/tests/iscsiadm-test-bad-dns1 | 21 -
.../plugins/ifcfg-rh/tests/iscsiadm-test-bad-dns2 | 21 -
.../plugins/ifcfg-rh/tests/iscsiadm-test-bad-entry | 35 -
.../ifcfg-rh/tests/iscsiadm-test-bad-gateway | 21 -
.../ifcfg-rh/tests/iscsiadm-test-bad-ipaddr | 21 -
.../ifcfg-rh/tests/iscsiadm-test-bad-record | 18 -
.../plugins/ifcfg-rh/tests/iscsiadm-test-dhcp | 33 -
.../plugins/ifcfg-rh/tests/iscsiadm-test-static | 35 -
.../ifcfg-rh/tests/network-scripts/Makefile.am | 3 +-
.../ifcfg-rh/tests/network-scripts/ifcfg-test-ibft | 10 +
.../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 1336 ++++----------------
41 files changed, 1998 insertions(+), 1564 deletions(-)

Upstream: cgit.freedesktop.org

  • Share