[PATCH] Rename driver backend to not be so generic

[Adam Stokes]

Rename drv_initscripts driver backend to indicate this being a Linux only set of
routines.
---
 src/Makefile.am       |    2 +-
 src/drv_initscripts.c | 1097 -------------------------------------------------
 src/drv_linux.c       | 1097 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 1098 insertions(+), 1098 deletions(-)
 delete mode 100644 src/drv_initscripts.c
 create mode 100644 src/drv_linux.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 9d8a3d7..0c16a22 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,7 @@ EXTRA_DIST = netcf_public.syms \
 	netcf_private.syms
 
 if NETCF_DRIVER_INITSCRIPTS
-DRIVER_SOURCES = drv_initscripts.c dutil.h dutil.c \
+DRIVER_SOURCES = drv_linux.c dutil.h dutil.c \
      dutil_linux.h dutil_linux.c
 endif
 
diff --git a/src/drv_initscripts.c b/src/drv_initscripts.c
deleted file mode 100644
index b2d96cb..0000000
--- a/src/drv_initscripts.c
+++ /dev/null
@@ -1,1097 +0,0 @@
-/*
- * drv_initscripts.c: the initscripts backend for netcf
- *
- * Copyright (C) 2009 Red Hat Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Author: David Lutterkort <lutter(a)redhat.com&gt;
- */
-
-#include <config.h>
-#include <internal.h>
-
-#include <augeas.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
-#include "safe-alloc.h"
-#include "ref.h"
-#include "list.h"
-#include "dutil.h"
-#include "dutil_linux.h"
-
-#include <libxml/parser.h>
-#include <libxml/relaxng.h>
-#include <libxml/tree.h>
-#include <libxslt/xslt.h>
-#include <libxslt/xsltInternals.h>
-#include <libxslt/transform.h>
-#include <libxslt/xsltutils.h>
-
-#include <libexslt/exslt.h>
-
-static const char *const network_scripts_path =
-    "/files/etc/sysconfig/network-scripts";
-
-static const char *const ifcfg_path =
-    "/files/etc/sysconfig/network-scripts/*";
-
-/* Augeas should only load the files we are interested in */
-static const struct augeas_pv augeas_xfm_common_pv[] = {
-    /* Ifcfg files */
-    { "/augeas/load/Ifcfg/lens", "Sysconfig.lns" },
-    { "/augeas/load/Ifcfg/incl",
-      "/etc/sysconfig/network-scripts/ifcfg-*" },
-    { "/augeas/load/Ifcfg/excl[1]", "*~" },
-    { "/augeas/load/Ifcfg/excl[2]", "*.bak" },
-    { "/augeas/load/Ifcfg/excl[3]", "*.orig" },
-    { "/augeas/load/Ifcfg/excl[4]", "*.rpmnew" },
-    { "/augeas/load/Ifcfg/excl[5]", "*.rpmorig" },
-    { "/augeas/load/Ifcfg/excl[6]", "*.rpmsave" },
-    { "/augeas/load/Ifcfg/excl[7]", "*.augnew" },
-    { "/augeas/load/Ifcfg/excl[8]", "*.augsave" },
-    /* modprobe config */
-    { "/augeas/load/Modprobe/lens", "Modprobe.lns" },
-    { "/augeas/load/Modprobe/incl[1]", "/etc/modprobe.d/*" },
-    { "/augeas/load/Modprobe/incl[2]", "/etc/modprobe.conf" },
-    { "/augeas/load/Modprobe/excl[1]", "*.augnew" },
-    { "/augeas/load/Modprobe/excl[2]", "*.augsave" },
-    { "/augeas/load/Modprobe/excl[3]", "*.rpmsave" },
-    { "/augeas/load/Modprobe/excl[4]", "*.rpmnew" },
-    { "/augeas/load/Modprobe/excl[5]", "*~" },
-    /* sysfs (choice entries from /class/net) */
-    { "/augeas/load/Sysfs/lens", "Netcf.id" },
-    { "/augeas/load/Sysfs/incl", "/sys/class/net/*/address" }
-};
-
-static const struct augeas_xfm_table augeas_xfm_common =
-    { .size = ARRAY_CARDINALITY(augeas_xfm_common_pv),
-      .pv = augeas_xfm_common_pv };
-
-/* Entries in a ifcfg file that tell us that the interface
- * is not a toplevel interface
- */
-static const char *const subif_paths[] = {
-    "MASTER", "BRIDGE"
-};
-
-static int is_slave(struct netcf *ncf, const char *intf) {
-    for (int s = 0; s < ARRAY_CARDINALITY(subif_paths); s++) {
-        int r;
-        r = aug_fmt_match(ncf, NULL, "%s/%s", intf, subif_paths[s]);
-        if (r != 0)
-            return r;
-    }
-    return 0;
-}
-
-static bool has_ifcfg_file(struct netcf *ncf, const char *name) {
-    int nmatches;
-
-    nmatches = aug_fmt_match(ncf, NULL,
-                             "%s[ DEVICE = '%s'"
-                             "    or BRIDGE = '%s'"
-                             "    or MASTER = '%s'"
-                             "    or MASTER = ../*[BRIDGE = '%s']/DEVICE
]/DEVICE",
-                             ifcfg_path, name, name, name, name);
-    return nmatches > 0;
-}
-
-static int cmpstrp(const void *p1, const void *p2) {
-    const char *s1 = * (const char **)p1;
-    const char *s2 = * (const char **)p2;
-    return strcmp(s1, s2);
-}
-
-/* Find the path to the ifcfg file that has the configuration for the
- * interface with MAC address MAC.
- */
-static char *find_ifcfg_path_by_hwaddr(struct netcf *ncf, const char *mac) {
-    static const char *const hwaddr_str = "/HWADDR";
-
-    int nhwaddr = 0, r;
-    char **hwaddr = NULL;
-    struct augeas *aug = NULL;
-
-    aug = get_augeas(ncf);
-    ERR_BAIL(ncf);
-
-    // It would be nice if Augeas provided a way to do case-insensitive
-    // matching. For now, we just write it out
-    nhwaddr = aug_fmt_match(ncf, &hwaddr, "%s%s", ifcfg_path, hwaddr_str);
-    ERR_COND_BAIL(nhwaddr < 0, ncf, EOTHER);
-
-    /* Sort because need_config will return the last match in case
-     * of multiple matches */
-    qsort(hwaddr, nhwaddr, sizeof(*hwaddr), cmpstrp);
-    int match = -1;
-    for (int i=0; i < nhwaddr; i++) {
-        const char *addr;
-        r = aug_get(aug, hwaddr[i], &addr);
-        ERR_COND_BAIL(r != 1, ncf, EOTHER);
-        if (STRCASEEQ(addr, mac))
-            match = i;
-    }
-    if (match != -1) {
-        char *path = hwaddr[match];
-        hwaddr[match] = NULL;
-        path[strlen(path) - strlen(hwaddr_str)] = '\0';
-        free_matches(nhwaddr, &hwaddr);
-        return path;
-    }
- error:
-    free_matches(nhwaddr, &hwaddr);
-    return NULL;
-}
-
-/* Find the path to the ifcfg file that has the configuration for the
- * interface by checking for an entry 'DEVICE=NAME'
- */
-static char *find_ifcfg_path_by_device(struct netcf *ncf, const char *name) {
-    struct augeas *aug = NULL;
-    int ndevs = 0;
-    char **devs = NULL;
-
-    aug = get_augeas(ncf);
-    ERR_BAIL(ncf);
-
-    ndevs = aug_fmt_match(ncf, &devs, "%s[DEVICE = '%s']",
-                          ifcfg_path, name);
-    ERR_COND_BAIL(ndevs < 0, ncf, EOTHER);
-
-    if (ndevs == 0)
-        return NULL;
-
-    qsort(devs, ndevs, sizeof(*devs), cmpstrp);
-
-    char *path = devs[ndevs - 1];
-    devs[ndevs - 1] = NULL;
-
-    free_matches(ndevs, &devs);
-
-    return path;
- error:
-    free_matches(ndevs, &devs);
-    return NULL;
-}
-
-/* Find the path to the ifcfg file that has the configuration for
- * the device NAME. The logic follows the need_config function
- * in /etc/sysconfig/network-scripts/network-functions
- */
-static char *find_ifcfg_path(struct netcf *ncf, const char *name) {
-    struct augeas *aug = NULL;
-    char *path = NULL;
-    const char *mac = NULL;
-    int r, nmatches;
-
-    aug = get_augeas(ncf);
-    ERR_BAIL(ncf);
-
-    /* if ifcfg-NAME exists, use that */
-    r = xasprintf(&path, "%s/ifcfg-%s", network_scripts_path, name);
-    ERR_NOMEM(r < 0, ncf);
-
-    nmatches = aug_match(aug, path, NULL);
-    ERR_COND_BAIL(nmatches < 0, ncf, EOTHER);
-
-    if (nmatches == 1)
-        return path;
-
-    FREE(path);
-
-    /* Now find the config by MAC, matching on HWADDR */
-    r = aug_get_mac(ncf, name, &mac);
-    ERR_COND_BAIL(r < 0, ncf, EOTHER);
-    if (r > 0) {
-        path = find_ifcfg_path_by_hwaddr(ncf, mac);
-        ERR_BAIL(ncf);
-        if (path != NULL)
-            return path;
-    }
-
-    path = find_ifcfg_path_by_device(ncf, name);
-    ERR_BAIL(ncf);
-
-    return path;
- error:
-    FREE(path);
-    return NULL;
-}
-
-/* Given NDEVS path to DEVICE entries which may contain duplicate devices,
- * produce a list of canonical paths to the interfaces in INTF and return
- * the number of entries. Return -1 on error
- */
-static int uniq_ifcfg_paths(struct netcf *ncf,
-                            int ndevs, char **devs,
-                            char ***intf) {
-    struct augeas *aug;
-    int r;
-    int ndevnames = 0;
-    const char **devnames = NULL;
-
-    aug = get_augeas(ncf);
-    ERR_BAIL(ncf);
-
-    /* List unique device names */
-    r = ALLOC_N(devnames, ndevs);
-    ERR_NOMEM(r < 0, ncf);
-
-    for (int i=0; i < ndevs; i++) {
-        const char *name = NULL;
-        r = aug_get(aug, devs[i], &name);
-        ERR_COND_BAIL(r != 1, ncf, EOTHER);
-        int exists = 0;
-        for (int j = 0; j < ndevnames; j++)
-            if (STREQ(name, devnames[j])) {
-                exists = 1;
-                break;
-            }
-        if (!exists)
-            devnames[ndevnames++] = name;
-    }
-    qsort(devnames, ndevnames, sizeof(*devnames), cmpstrp);
-
-    /* Find canonical config for each device name */
-    r = ALLOC_N(*intf, ndevnames);
-    ERR_NOMEM(r < 0, ncf);
-    for (int i= 0; i < ndevnames; i++) {
-        (*intf)[i] = find_ifcfg_path(ncf, devnames[i]);
-        ERR_BAIL(ncf);
-    }
-
-    FREE(devnames);
-    return ndevnames;
-
- error:
-    FREE(devnames);
-    free_matches(ndevnames, intf);
-    return -1;
-}
-
-/* List all configured network devices; returns the number of devices or -1
- * on error. On success, the path to the config file for each interface
- * is returned in INTF
- */
-static int list_ifcfg_paths(struct netcf *ncf, char ***intf) {
-    int result = 0, ndevs;
-    char **devs = NULL;
-
-    ndevs = aug_fmt_match(ncf, &devs, "%s/DEVICE", ifcfg_path);
-    ERR_COND_BAIL(ndevs < 0, ncf, EOTHER);
-
-    result = uniq_ifcfg_paths(ncf, ndevs, devs, intf);
-    ERR_BAIL(ncf);
-
-    free_matches(ndevs, &devs);
-    return result;
-
- error:
-    free_matches(ndevs, &devs);
-    return -1;
-}
-
-static int list_interfaces(struct netcf *ncf, char ***intf) {
-    int nint = 0, result = 0;
-    struct augeas *aug = NULL;
-
-    aug = get_augeas(ncf);
-    ERR_BAIL(ncf);
-
-    /* Look in augeas for all interfaces */
-    nint = list_ifcfg_paths(ncf, intf);
-    ERR_BAIL(ncf);
-    result = nint;
-
-    /* Filter out the interfaces that are slaves/subordinate */
-    for (int i = 0; i < result;) {
-        if (is_slave(ncf, (*intf)[i])) {
-            FREE((*intf)[i]);
-            memmove(*intf + i, *intf + i + 1,
-                    (nint - (i + 1))*sizeof((*intf)[0]));
-            result -= 1;
-        } else {
-            i += 1;
-        }
-    }
-    return result;
- error:
-    free_matches(nint, intf);
-    return -1;
-}
-
-int drv_init(struct netcf *ncf) {
-    int r;
-    struct stat stats;
-
-    if (ALLOC(ncf->driver) < 0)
-        return -1;
-
-    ncf->driver->ioctl_fd = -1;
-
-    r = add_augeas_xfm_table(ncf, &augeas_xfm_common);
-    if (r < 0)
-        goto error;
-
-    if (stat(ncf->root, &stats) != 0 || !S_ISDIR(stats.st_mode)) {
-        report_error(ncf, NETCF_EFILE,
-                     "invalid root '%s' is not a directory",
ncf->root);
-        return -1;
-    }
-
-    // FIXME: Check for errors
-    xsltInit();
-    exsltStrRegister();
-    ncf->driver->get = parse_stylesheet(ncf, "initscripts-get.xsl");
-    ncf->driver->put = parse_stylesheet(ncf, "initscripts-put.xsl");
-    ncf->driver->rng = rng_parse(ncf, "interface.rng");
-    ERR_BAIL(ncf);
-
-    /* open a socket for interface ioctls */
-    ncf->driver->ioctl_fd = init_ioctl_fd(ncf);
-    if (ncf->driver->ioctl_fd < 0)
-        goto error;
-    if (netlink_init(ncf) < 0)
-        goto error;
-    return 0;
-
- error:
-    drv_close(ncf);
-    return -1;
-}
-
-void drv_close(struct netcf *ncf) {
-    if (ncf == NULL || ncf->driver == NULL)
-        return;
-    xsltFreeStylesheet(ncf->driver->get);
-    xsltFreeStylesheet(ncf->driver->put);
-    xmlRelaxNGFree(ncf->driver->rng);
-    netlink_close(ncf);
-    if (ncf->driver->ioctl_fd >= 0)
-        close(ncf->driver->ioctl_fd);
-    aug_close(ncf->driver->augeas);
-    FREE(ncf->driver->augeas_xfm_tables);
-    FREE(ncf->driver);
-}
-
-void drv_entry(struct netcf *ncf) {
-    ncf->driver->load_augeas = 1;
-}
-
-static int list_interface_ids(struct netcf *ncf,
-                              int maxnames, char **names,
-                              unsigned int flags,
-                              const char *id_attr) {
-    struct augeas *aug = NULL;
-    int nint = 0, nmatches = 0, nqualified = 0, result = 0, r;
-    char **intf = NULL, **matches = NULL;
-
-    aug = get_augeas(ncf);
-    ERR_BAIL(ncf);
-    nint = list_interfaces(ncf, &intf);
-    ERR_BAIL(ncf);
-    if (!names) {
-        maxnames = nint;    /* if not returning list, ignore maxnames too */
-    }
-    for (result = 0; (result < nint) && (nqualified < maxnames); result++)
{
-        nmatches = aug_fmt_match(ncf, &matches,
-                                 "%s/%s", intf[result], id_attr);
-        ERR_BAIL(ncf);
-        if (nmatches > 0) {
-            const char *name;
-            int is_qualified = ((flags & (NETCF_IFACE_ACTIVE|NETCF_IFACE_INACTIVE))
-                                == (NETCF_IFACE_ACTIVE|NETCF_IFACE_INACTIVE));
-
-            r = aug_get(aug, matches[nmatches-1], &name);
-            ERR_COND_BAIL(r < 0, ncf, EOTHER);
-
-            if (!is_qualified) {
-                int is_active = if_is_active(ncf, name);
-                if ((is_active && (flags & NETCF_IFACE_ACTIVE))
-                    || ((!is_active) && (flags & NETCF_IFACE_INACTIVE))) {
-
-                    is_qualified = 1;
-                }
-            }
-
-            if (is_qualified) {
-                if (names) {
-                    names[nqualified] = strdup(name);
-                    ERR_NOMEM(names[nqualified] == NULL, ncf);
-                }
-                nqualified++;
-            }
-        }
-        free_matches(nmatches, &matches);
-    }
-    free_matches(nint, &intf);
-    return nqualified;
- error:
-    free_matches(nmatches, &matches);
-    free_matches(nint, &intf);
-    return -1;
-}
-
-int drv_list_interfaces(struct netcf *ncf, int maxnames, char **names,
-        unsigned int flags) {
-    return list_interface_ids(ncf, maxnames, names, flags, "DEVICE");
-}
-
-int drv_num_of_interfaces(struct netcf *ncf, unsigned int flags) {
-    return list_interface_ids(ncf, 0, NULL, flags, "DEVICE");
-}
-
-struct netcf_if *drv_lookup_by_name(struct netcf *ncf, const char *name) {
-    struct netcf_if *nif = NULL;
-    char *pathx = NULL;
-    char *name_dup = NULL;
-    struct augeas *aug;
-
-    aug = get_augeas(ncf);
-    ERR_BAIL(ncf);
-
-    pathx = find_ifcfg_path(ncf, name);
-    ERR_BAIL(ncf);
-
-    if (pathx == NULL || is_slave(ncf, pathx))
-        goto done;
-
-    name_dup = strdup(name);
-    ERR_NOMEM(name_dup == NULL, ncf);
-
-    nif = make_netcf_if(ncf, name_dup);
-    ERR_BAIL(ncf);
-    goto done;
-
- error:
-    unref(nif, netcf_if);
-    FREE(name_dup);
- done:
-    FREE(pathx);
-    return nif;
-}
-
-/* Get an XML desription of the interfaces (just paths, really) in INTF.
- * The format is a very simple representation of the Augeas tree (see
- * xml/augeas.rng)
- */
-static xmlDocPtr aug_get_xml(struct netcf *ncf, int nint, char **intf) {
-    struct augeas *aug;
-    xmlDocPtr result = NULL;
-    xmlNodePtr root = NULL, tree = NULL;
-    char **matches = NULL;
-    int nmatches, r;
-
-    aug = get_augeas(ncf);
-    ERR_BAIL(ncf);
-
-    result = xmlNewDoc(BAD_CAST "1.0");
-    root = xmlNewNode(NULL, BAD_CAST "forest");
-    xmlDocSetRootElement(result, root);
-
-    for (int i=0; i < nint; i++) {
-        tree = xmlNewChild(root, NULL, BAD_CAST "tree", NULL);
-        xmlNewProp(tree, BAD_CAST "path", BAD_CAST intf[i]);
-        nmatches = aug_fmt_match(ncf, &matches, "%s/%s", intf[i],
"*");
-        ERR_COND_BAIL(nint < 0, ncf, EOTHER);
-        for (int j = 0; j < nmatches; j++) {
-            xmlNodePtr node = xmlNewChild(tree, NULL, BAD_CAST "node", NULL);
-            const char *value;
-            xmlNewProp(node, BAD_CAST "label",
-                       BAD_CAST matches[j] + strlen(intf[i]) + 1);
-            r = aug_get(aug, matches[j], &value);
-            ERR_COND_BAIL(r < 0, ncf, EOTHER);
-            xmlNewProp(node, BAD_CAST "value", BAD_CAST value);
-        }
-        free_matches(nmatches, &matches);
-    }
-
-    return result;
-
- error:
-    free_matches(nmatches, &matches);
-    xmlFreeDoc(result);
-    return NULL;
-}
-
-/* Write the XML doc in the simple Augeas format into the Augeas tree */
-static int aug_put_xml(struct netcf *ncf, xmlDocPtr xml) {
-    xmlNodePtr forest;
-    char *path = NULL, *lpath = NULL, *label = NULL, *value = NULL;
-    struct augeas *aug = NULL;
-    int result = -1;
-    int r;
-
-    aug = get_augeas(ncf);
-    ERR_BAIL(ncf);
-
-    forest = xmlDocGetRootElement(xml);
-    ERR_THROW(forest == NULL, ncf, EINTERNAL, "missing root element");
-    ERR_THROW(! xmlStrEqual(forest->name, BAD_CAST "forest"), ncf,
-              EINTERNAL, "expected root node labeled 'forest', not
'%s'",
-              forest->name);
-    list_for_each(tree, forest->children) {
-        ERR_THROW(! xmlStrEqual(tree->name, BAD_CAST "tree"), ncf,
-                  EINTERNAL, "expected node labeled 'tree', not
'%s'",
-                  tree->name);
-        path = xml_prop(tree, "path");
-        int toplevel = 1;
-        /* This is a little drastic, since it clears out the file entirely */
-        r = aug_rm(aug, path);
-        ERR_THROW(r < 0, ncf, EINTERNAL, "aug_rm of '%s' failed",
path);
-        list_for_each(node, tree->children) {
-            label = xml_prop(node, "label");
-            value = xml_prop(node, "value");
-            /* We should mark the toplevel interface from the XSLT */
-            if (STREQ(label, "BRIDGE") || STREQ(label, "MASTER")) {
-                toplevel = 0;
-            }
-            r = xasprintf(&lpath, "%s/%s", path, label);
-            ERR_NOMEM(r < 0, ncf);
-
-            r = aug_set(aug, lpath, value);
-            ERR_THROW(r < 0, ncf, EOTHER,
-                      "aug_set of '%s' failed", lpath);
-            FREE(lpath);
-            xmlFree(label);
-            xmlFree(value);
-            label = value = NULL;
-        }
-        xmlFree(path);
-        path = NULL;
-    }
-    result = 0;
- error:
-    xmlFree(label);
-    xmlFree(value);
-    xmlFree(path);
-    FREE(lpath);
-    return result;
-}
-
-/* given a netcf_if, get the config for an interface in the simple
- * Augeas format
- */
-static xmlDocPtr aug_get_xml_for_nif(struct netcf_if *nif) {
-    struct netcf *ncf;
-    char **devs = NULL, **intf = NULL;
-    xmlDocPtr aug_xml = NULL;
-    int ndevs = 0, nint = 0;
-
-    ncf = nif->ncf;
-    ndevs = aug_fmt_match(ncf, &devs,
-              "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER =
'%s'"
-              "    or MASTER = ../*[BRIDGE = '%s']/DEVICE ]/DEVICE",
-              ifcfg_path, nif->name, nif->name, nif->name, nif->name);
-    ERR_BAIL(ncf);
-
-    nint = uniq_ifcfg_paths(ncf, ndevs, devs, &intf);
-    ERR_BAIL(ncf);
-
-    aug_xml = aug_get_xml(ncf, nint, intf);
-
- error:
-    free_matches(ndevs, &devs);
-    free_matches(nint, &intf);
-    return aug_xml;
-}
-
-/* return the current static configuration (as saved on disk) */
-char *drv_xml_desc(struct netcf_if *nif) {
-    char *result = NULL;
-    struct netcf *ncf;
-    xmlDocPtr aug_xml = NULL;
-
-    ncf = nif->ncf;
-    aug_xml = aug_get_xml_for_nif(nif);
-    ERR_BAIL(ncf);
-
-    result = apply_stylesheet_to_string(ncf, ncf->driver->put, aug_xml);
-
- error:
-    xmlFreeDoc(aug_xml);
-    return result;
-}
-
-/* return the current live configuration state - a combination of
- * drv_xml_desc + results of querying the interface directly */
-
-char *drv_xml_state(struct netcf_if *nif) {
-    char *result = NULL;
-    int r, result_len;
-    struct netcf *ncf;
-    xmlDocPtr ncf_xml = NULL;
-    xmlNodePtr root;
-
-    ncf = nif->ncf;
-
-    /* start out with an empty tree rather than the config tree. Just
-     * put in the interface node and its name
-     */
-    ncf_xml = xmlNewDoc(BAD_CAST "1.0");
-    ERR_NOMEM(ncf_xml == NULL, ncf);
-    root = xmlNewNode(NULL, BAD_CAST "interface");
-    ERR_NOMEM(root == NULL, ncf);
-    xmlDocSetRootElement(ncf_xml, root);
-
-    /* add all info we can gather from the kernel/sysfs/procfs */
-    add_state_to_xml_doc(nif, ncf_xml);
-    ERR_BAIL(ncf);
-
-    r = xsltSaveResultToString((xmlChar **)&result, &result_len,
-                               ncf_xml, ncf->driver->put);
-    ERR_NOMEM(r < 0, ncf);
-
- done:
-    xmlFreeDoc(ncf_xml);
-    return result;
- error:
-    FREE(result);
-    result = 0;
-    goto done;
-}
-
-/* Report various status info about the interface as bits in
- * "flags". Returns 0 on success, -1 on failure
- */
-int drv_if_status(struct netcf_if *nif, unsigned int *flags) {
-    int is_active;
-
-    ERR_THROW(flags == NULL, nif->ncf, EOTHER, "NULL pointer for flags in
ncf_if_status");
-    *flags = 0;
-    is_active = if_is_active(nif->ncf, nif->name);
-    if (is_active)
-        *flags |= NETCF_IFACE_ACTIVE;
-    else
-        *flags |= NETCF_IFACE_INACTIVE;
-    return 0;
-error:
-    return -1;
-}
-
-/* Get the content of /interface/@name. Result must be freed with xmlFree()
- *
- * The name on VLAN interfaces is optional; if there is no
- * /interface/@name, construct a name for the VLAN interface and set
- * /interface/@name in NCF_XML to it. This way, other code can assume we
- * always have a name on the interface.
- */
-static char *device_name_from_xml(struct netcf *ncf, xmlDocPtr ncf_xml) {
-    xmlXPathContextPtr context = NULL;
-	xmlXPathObjectPtr obj = NULL;
-    char *result = NULL;
-
-	context = xmlXPathNewContext(ncf_xml);
-    ERR_NOMEM(context == NULL, ncf);
-
-	obj = xmlXPathEvalExpression(BAD_CAST "string(/interface/@name)", context);
-    ERR_NOMEM(obj == NULL, ncf);
-    assert(obj->type == XPATH_STRING);
-
-    if (xmlStrlen(obj->stringval) == 0) {
-        xmlXPathFreeObject(obj);
-        obj = xmlXPathEvalExpression(BAD_CAST
-         "concat(/interface/vlan/interface/@name, '.',
/interface/vlan/@tag)",
-        context);
-        ERR_NOMEM(obj == NULL, ncf);
-        ERR_COND_BAIL(xmlStrlen(obj->stringval) == 0, ncf, EINTERNAL);
-        assert(obj->type == XPATH_STRING);
-
-        xmlNodePtr iface;
-        iface = xmlDocGetRootElement(ncf_xml);
-        ERR_COND_BAIL(iface == NULL, ncf, EINTERNAL);
-        xmlSetProp(iface, BAD_CAST "name", BAD_CAST result);
-    }
-
-    result = (char *) xmlStrdup(obj->stringval);
- error:
-    xmlXPathFreeObject(obj);
-    xmlXPathFreeContext(context);
-    return result;
-}
-
-/* The device NAME is a bond if it is mentioned as the MASTER in sopme
- * other devices config file
- */
-static bool is_bond(struct netcf *ncf, const char *name) {
-    int nmatches = 0;
-
-    nmatches = aug_fmt_match(ncf, NULL,
-                             "%s[ MASTER = '%s']", ifcfg_path, name);
-    return nmatches > 0;
-}
-
-/* The device NAME is a bridge if it has an entry TYPE=Bridge */
-static bool is_bridge(struct netcf *ncf, const char *name) {
-    int nmatches = 0;
-
-    nmatches = aug_fmt_match(ncf, NULL,
-                             "%s[ DEVICE = '%s' and TYPE =
'Bridge']",
-                             ifcfg_path, name);
-    return nmatches > 0;
-}
-
-static int bridge_slaves(struct netcf *ncf, const char *name, char ***slaves) {
-    struct augeas *aug = NULL;
-    int r, nslaves = 0;
-
-    aug = get_augeas(ncf);
-    ERR_BAIL(ncf);
-
-    nslaves = aug_fmt_match(ncf, slaves,
-                            "%s[ BRIDGE = '%s' ]/DEVICE", ifcfg_path,
name);
-    ERR_BAIL(ncf);
-    for (int i=0; i < nslaves; i++) {
-        char *p = (*slaves)[i];
-        const char *dev;
-        r = aug_get(aug, p, &dev);
-        ERR_COND_BAIL(r < 0, ncf, EOTHER);
-
-        (*slaves)[i] = strdup(dev);
-        free(p);
-        ERR_NOMEM(slaves[i] == NULL, ncf);
-    }
-    return nslaves;
- error:
-    free_matches(nslaves, slaves);
-    return -1;
-}
-
-
-/* For an interface NAME, remove the ifcfg-* files for that interface and
- * all its slaves. */
-static void rm_interface(struct netcf *ncf, const char *name) {
-    int r;
-    char *path = NULL;
-    struct augeas *aug = NULL;
-
-    aug = get_augeas(ncf);
-    ERR_BAIL(ncf);
-
-    /* The last or clause catches slaves of a bond that are enslaved to
-     * a bridge NAME */
-    r = xasprintf(&path,
-          "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER =
'%s' "
-          "    or MASTER = ../*[BRIDGE = '%s']/DEVICE ]",
-                  ifcfg_path, name, name, name, name);
-    ERR_NOMEM(r < 0, ncf);
-
-    r = aug_rm(aug, path);
-    ERR_COND_BAIL(r < 0, ncf, EOTHER);
- error:
-    FREE(path);
-}
-
-/* Remove all interfaces and their slaves mentioned in NCF_XML.  We need to
- * remove interfaces one by one when we define an interface, since what
- * will become a subinterface may not be related to the new toplevel
- * interface, and calling RM_INTERFACE on the toplevel interface is
- * therefore not enough.
- */
-static void rm_all_interfaces(struct netcf *ncf, xmlDocPtr ncf_xml) {
-    xmlXPathContextPtr context = NULL;
-	xmlXPathObjectPtr obj = NULL;
-
-	context = xmlXPathNewContext(ncf_xml);
-    ERR_NOMEM(context == NULL, ncf);
-
-    obj = xmlXPathEvalExpression(BAD_CAST
-                                 "//interface[count(parent::vlan) = 0]",
-                                 context);
-    ERR_NOMEM(obj == NULL, ncf);
-
-
-    xmlNodeSetPtr ns = obj->nodesetval;
-    for (int i=0; i < ns->nodeNr; i++) {
-        xmlChar *name = xmlGetProp(ns->nodeTab[i], BAD_CAST "name");
-        ERR_NOMEM(name == NULL, ncf);
-        rm_interface(ncf, (char *) name);
-        xmlFree(name);
-        ERR_BAIL(ncf);
-	}
- error:
-    xmlXPathFreeObject(obj);
-    xmlXPathFreeContext(context);
-}
-
-/* Dig through interface NAME and all its subinterfaces for bonds
- * and either add aliases in modprobe.conf for it (ALIAS == true), or
- * remove such aliases (ALIAS == false)
- */
-static void bond_setup(struct netcf *ncf, const char *name, bool alias) {
-    void (*setup)(struct netcf *ncf, const char *name);
-    int nslaves = 0;
-    char **slaves = NULL;
-
-    if (alias)
-        setup = modprobed_alias_bond;
-    else
-        setup = modprobed_unalias_bond;
-
-    if (is_bond(ncf, name)) {
-        setup(ncf, name);
-        ERR_BAIL(ncf);
-    }
-
-    if (is_bridge(ncf, name)) {
-        nslaves = bridge_slaves(ncf, name, &slaves);
-        ERR_BAIL(ncf);
-        for (int i=0; i < nslaves; i++) {
-            if (is_bond(ncf, slaves[i])) {
-                setup(ncf, slaves[i]);
-                ERR_BAIL(ncf);
-            }
-        }
-    }
-
- error:
-    free_matches(nslaves, &slaves);
-    return;
-}
-
-struct netcf_if *drv_define(struct netcf *ncf, const char *xml_str) {
-    xmlDocPtr ncf_xml = NULL, aug_xml = NULL;
-    char *name = NULL;
-    struct netcf_if *result = NULL;
-    int r;
-    struct augeas *aug = get_augeas(ncf);
-
-    ncf_xml = parse_xml(ncf, xml_str);
-    ERR_BAIL(ncf);
-
-    rng_validate(ncf, ncf_xml);
-    ERR_BAIL(ncf);
-
-    name = device_name_from_xml(ncf, ncf_xml);
-    ERR_COND_BAIL(name == NULL, ncf, EINTERNAL);
-
-    rm_all_interfaces(ncf, ncf_xml);
-    ERR_BAIL(ncf);
-
-    aug_xml = apply_stylesheet(ncf, ncf->driver->get, ncf_xml);
-    ERR_BAIL(ncf);
-
-    aug_put_xml(ncf, aug_xml);
-    ERR_BAIL(ncf);
-
-    bond_setup(ncf, name, true);
-    ERR_BAIL(ncf);
-
-    r = aug_save(aug);
-    if (r < 0 && NCF_DEBUG(ncf)) {
-        fprintf(stderr, "Errors from aug_save:\n");
-        aug_print(aug, stderr, "/augeas//error");
-    }
-    ERR_THROW(r < 0, ncf, EOTHER, "aug_save failed");
-
-    result = make_netcf_if(ncf, name);
-    ERR_BAIL(ncf);
-
- done:
-    xmlFreeDoc(ncf_xml);
-    xmlFreeDoc(aug_xml);
-    return result;
- error:
-    unref(result, netcf_if);
-    goto done;
-}
-
-int drv_undefine(struct netcf_if *nif) {
-    struct augeas *aug = NULL;
-    struct netcf *ncf = nif->ncf;
-    int r;
-
-    aug = get_augeas(ncf);
-    ERR_BAIL(ncf);
-
-    bond_setup(ncf, nif->name, false);
-    ERR_BAIL(ncf);
-
-    rm_interface(ncf, nif->name);
-    ERR_BAIL(ncf);
-
-    r = aug_save(aug);
-    ERR_COND_BAIL(r < 0, ncf, EOTHER);
-
-    return 0;
- error:
-    return -1;
-}
-
-int drv_lookup_by_mac_string(struct netcf *ncf, const char *mac,
-                             int maxifaces, struct netcf_if **ifaces)
-{
-    struct augeas *aug = NULL;
-    char *path = NULL, *ifcfg = NULL;
-    const char **names = NULL;
-    int nmatches = 0;
-    char **matches = NULL;
-    int r;
-    int result = -1;
-
-    MEMZERO(ifaces, maxifaces);
-
-    aug = get_augeas(ncf);
-    ERR_BAIL(ncf);
-
-    nmatches = aug_match_mac(ncf, mac, &matches);
-    ERR_BAIL(ncf);
-    if (nmatches == 0) {
-        result = 0;
-        goto done;
-    }
-
-    r = ALLOC_N(names, nmatches);
-    ERR_NOMEM(r < 0, ncf);
-
-    int cnt = 0;
-    for (int i = 0; i < nmatches; i++) {
-        if (!has_ifcfg_file(ncf, matches[i]))
-            continue;
-        r = xasprintf(&ifcfg, "%s[DEVICE = '%s']", ifcfg_path,
matches[i]);
-        ERR_NOMEM(r < 0, ncf);
-
-        if (! is_slave(ncf, ifcfg))
-            names[cnt++] = matches[i];
-        FREE(ifcfg);
-    }
-    for (int i=0; i < cnt && i < maxifaces; i++) {
-        char *name = strdup(names[i]);
-        ERR_NOMEM(name == NULL, ncf);
-        ifaces[i] = make_netcf_if(ncf, name);
-        ERR_BAIL(ncf);
-    }
-    result = cnt;
-    goto done;
-
- error:
-    for (int i=0; i < maxifaces; i++)
-        unref(ifaces[i], netcf_if);
- done:
-    free(names);
-    free(ifcfg);
-    free(path);
-    free_matches(nmatches, &matches);
-    return result;
-}
-
-const char *drv_mac_string(struct netcf_if *nif) {
-    struct netcf *ncf = nif->ncf;
-    const char *mac;
-    char *path = NULL;
-    int r;
-
-    r = aug_get_mac(ncf, nif->name, &mac);
-    ERR_THROW(r < 0, ncf, EOTHER, "could not lookup MAC of %s",
nif->name);
-
-    if (mac != NULL) {
-        if (nif->mac == NULL || STRNEQ(nif->mac, mac)) {
-            FREE(nif->mac);
-            nif->mac = strdup(mac);
-            ERR_NOMEM(nif->mac == NULL, ncf);
-        }
-    } else {
-        FREE(nif->mac);
-    }
-    /* fallthrough intentional */
- error:
-    FREE(path);
-    return nif->mac;
-}
-
-/*
- * Bringing interfaces up/down
- */
-
-int drv_if_up(struct netcf_if *nif) {
-    static const char *const ifup = "ifup";
-    struct netcf *ncf = nif->ncf;
-    char **slaves = NULL;
-    int nslaves = 0;
-    int result = -1;
-
-    if (is_bridge(ncf, nif->name)) {
-        /* Bring up bridge slaves before the bridge */
-        nslaves = bridge_slaves(ncf, nif->name, &slaves);
-        ERR_BAIL(ncf);
-
-        for (int i=0; i < nslaves; i++) {
-            run1(ncf, ifup, slaves[i]);
-            ERR_BAIL(ncf);
-        }
-    }
-    run1(ncf, ifup, nif->name);
-    ERR_BAIL(ncf);
-    result = 0;
- error:
-    free_matches(nslaves, &slaves);
-    return result;
-}
-
-int drv_if_down(struct netcf_if *nif) {
-    static const char *const ifdown = "ifdown";
-    struct netcf *ncf = nif->ncf;
-    char **slaves = NULL;
-    int nslaves = 0;
-    int result = -1;
-
-    run1(ncf, ifdown, nif->name);
-    ERR_BAIL(ncf);
-    if (is_bridge(ncf, nif->name)) {
-        /* Bring up bridge slaves after the bridge */
-        nslaves = bridge_slaves(ncf, nif->name, &slaves);
-        ERR_BAIL(ncf);
-
-        for (int i=0; i < nslaves; i++) {
-            run1(ncf, ifdown, slaves[i]);
-            ERR_BAIL(ncf);
-        }
-    }
-    result = 0;
- error:
-    free_matches(nslaves, &slaves);
-    return result;
-}
-
-/*
- * Test interface
- */
-int drv_get_aug(struct netcf *ncf, const char *ncf_xml, char **aug_xml) {
-    /* Use utility implementation */
-    return dutil_get_aug(ncf, ncf_xml, aug_xml);
-}
-
-/* Transform the Augeas XML AUG_XML into interface XML NCF_XML */
-int drv_put_aug(struct netcf *ncf, const char *aug_xml, char **ncf_xml) {
-    /* Use utility implementation */
-    return dutil_put_aug(ncf, aug_xml, ncf_xml);
-}
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
-/* vim: set ts=4 sw=4 et: */
diff --git a/src/drv_linux.c b/src/drv_linux.c
new file mode 100644
index 0000000..b2d96cb
--- /dev/null
+++ b/src/drv_linux.c
@@ -0,0 +1,1097 @@
+/*
+ * drv_initscripts.c: the initscripts backend for netcf
+ *
+ * Copyright (C) 2009 Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *
+ * Author: David Lutterkort <lutter(a)redhat.com&gt;
+ */
+
+#include <config.h>
+#include <internal.h>
+
+#include <augeas.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+#include "safe-alloc.h"
+#include "ref.h"
+#include "list.h"
+#include "dutil.h"
+#include "dutil_linux.h"
+
+#include <libxml/parser.h>
+#include <libxml/relaxng.h>
+#include <libxml/tree.h>
+#include <libxslt/xslt.h>
+#include <libxslt/xsltInternals.h>
+#include <libxslt/transform.h>
+#include <libxslt/xsltutils.h>
+
+#include <libexslt/exslt.h>
+
+static const char *const network_scripts_path =
+    "/files/etc/sysconfig/network-scripts";
+
+static const char *const ifcfg_path =
+    "/files/etc/sysconfig/network-scripts/*";
+
+/* Augeas should only load the files we are interested in */
+static const struct augeas_pv augeas_xfm_common_pv[] = {
+    /* Ifcfg files */
+    { "/augeas/load/Ifcfg/lens", "Sysconfig.lns" },
+    { "/augeas/load/Ifcfg/incl",
+      "/etc/sysconfig/network-scripts/ifcfg-*" },
+    { "/augeas/load/Ifcfg/excl[1]", "*~" },
+    { "/augeas/load/Ifcfg/excl[2]", "*.bak" },
+    { "/augeas/load/Ifcfg/excl[3]", "*.orig" },
+    { "/augeas/load/Ifcfg/excl[4]", "*.rpmnew" },
+    { "/augeas/load/Ifcfg/excl[5]", "*.rpmorig" },
+    { "/augeas/load/Ifcfg/excl[6]", "*.rpmsave" },
+    { "/augeas/load/Ifcfg/excl[7]", "*.augnew" },
+    { "/augeas/load/Ifcfg/excl[8]", "*.augsave" },
+    /* modprobe config */
+    { "/augeas/load/Modprobe/lens", "Modprobe.lns" },
+    { "/augeas/load/Modprobe/incl[1]", "/etc/modprobe.d/*" },
+    { "/augeas/load/Modprobe/incl[2]", "/etc/modprobe.conf" },
+    { "/augeas/load/Modprobe/excl[1]", "*.augnew" },
+    { "/augeas/load/Modprobe/excl[2]", "*.augsave" },
+    { "/augeas/load/Modprobe/excl[3]", "*.rpmsave" },
+    { "/augeas/load/Modprobe/excl[4]", "*.rpmnew" },
+    { "/augeas/load/Modprobe/excl[5]", "*~" },
+    /* sysfs (choice entries from /class/net) */
+    { "/augeas/load/Sysfs/lens", "Netcf.id" },
+    { "/augeas/load/Sysfs/incl", "/sys/class/net/*/address" }
+};
+
+static const struct augeas_xfm_table augeas_xfm_common =
+    { .size = ARRAY_CARDINALITY(augeas_xfm_common_pv),
+      .pv = augeas_xfm_common_pv };
+
+/* Entries in a ifcfg file that tell us that the interface
+ * is not a toplevel interface
+ */
+static const char *const subif_paths[] = {
+    "MASTER", "BRIDGE"
+};
+
+static int is_slave(struct netcf *ncf, const char *intf) {
+    for (int s = 0; s < ARRAY_CARDINALITY(subif_paths); s++) {
+        int r;
+        r = aug_fmt_match(ncf, NULL, "%s/%s", intf, subif_paths[s]);
+        if (r != 0)
+            return r;
+    }
+    return 0;
+}
+
+static bool has_ifcfg_file(struct netcf *ncf, const char *name) {
+    int nmatches;
+
+    nmatches = aug_fmt_match(ncf, NULL,
+                             "%s[ DEVICE = '%s'"
+                             "    or BRIDGE = '%s'"
+                             "    or MASTER = '%s'"
+                             "    or MASTER = ../*[BRIDGE = '%s']/DEVICE
]/DEVICE",
+                             ifcfg_path, name, name, name, name);
+    return nmatches > 0;
+}
+
+static int cmpstrp(const void *p1, const void *p2) {
+    const char *s1 = * (const char **)p1;
+    const char *s2 = * (const char **)p2;
+    return strcmp(s1, s2);
+}
+
+/* Find the path to the ifcfg file that has the configuration for the
+ * interface with MAC address MAC.
+ */
+static char *find_ifcfg_path_by_hwaddr(struct netcf *ncf, const char *mac) {
+    static const char *const hwaddr_str = "/HWADDR";
+
+    int nhwaddr = 0, r;
+    char **hwaddr = NULL;
+    struct augeas *aug = NULL;
+
+    aug = get_augeas(ncf);
+    ERR_BAIL(ncf);
+
+    // It would be nice if Augeas provided a way to do case-insensitive
+    // matching. For now, we just write it out
+    nhwaddr = aug_fmt_match(ncf, &hwaddr, "%s%s", ifcfg_path, hwaddr_str);
+    ERR_COND_BAIL(nhwaddr < 0, ncf, EOTHER);
+
+    /* Sort because need_config will return the last match in case
+     * of multiple matches */
+    qsort(hwaddr, nhwaddr, sizeof(*hwaddr), cmpstrp);
+    int match = -1;
+    for (int i=0; i < nhwaddr; i++) {
+        const char *addr;
+        r = aug_get(aug, hwaddr[i], &addr);
+        ERR_COND_BAIL(r != 1, ncf, EOTHER);
+        if (STRCASEEQ(addr, mac))
+            match = i;
+    }
+    if (match != -1) {
+        char *path = hwaddr[match];
+        hwaddr[match] = NULL;
+        path[strlen(path) - strlen(hwaddr_str)] = '\0';
+        free_matches(nhwaddr, &hwaddr);
+        return path;
+    }
+ error:
+    free_matches(nhwaddr, &hwaddr);
+    return NULL;
+}
+
+/* Find the path to the ifcfg file that has the configuration for the
+ * interface by checking for an entry 'DEVICE=NAME'
+ */
+static char *find_ifcfg_path_by_device(struct netcf *ncf, const char *name) {
+    struct augeas *aug = NULL;
+    int ndevs = 0;
+    char **devs = NULL;
+
+    aug = get_augeas(ncf);
+    ERR_BAIL(ncf);
+
+    ndevs = aug_fmt_match(ncf, &devs, "%s[DEVICE = '%s']",
+                          ifcfg_path, name);
+    ERR_COND_BAIL(ndevs < 0, ncf, EOTHER);
+
+    if (ndevs == 0)
+        return NULL;
+
+    qsort(devs, ndevs, sizeof(*devs), cmpstrp);
+
+    char *path = devs[ndevs - 1];
+    devs[ndevs - 1] = NULL;
+
+    free_matches(ndevs, &devs);
+
+    return path;
+ error:
+    free_matches(ndevs, &devs);
+    return NULL;
+}
+
+/* Find the path to the ifcfg file that has the configuration for
+ * the device NAME. The logic follows the need_config function
+ * in /etc/sysconfig/network-scripts/network-functions
+ */
+static char *find_ifcfg_path(struct netcf *ncf, const char *name) {
+    struct augeas *aug = NULL;
+    char *path = NULL;
+    const char *mac = NULL;
+    int r, nmatches;
+
+    aug = get_augeas(ncf);
+    ERR_BAIL(ncf);
+
+    /* if ifcfg-NAME exists, use that */
+    r = xasprintf(&path, "%s/ifcfg-%s", network_scripts_path, name);
+    ERR_NOMEM(r < 0, ncf);
+
+    nmatches = aug_match(aug, path, NULL);
+    ERR_COND_BAIL(nmatches < 0, ncf, EOTHER);
+
+    if (nmatches == 1)
+        return path;
+
+    FREE(path);
+
+    /* Now find the config by MAC, matching on HWADDR */
+    r = aug_get_mac(ncf, name, &mac);
+    ERR_COND_BAIL(r < 0, ncf, EOTHER);
+    if (r > 0) {
+        path = find_ifcfg_path_by_hwaddr(ncf, mac);
+        ERR_BAIL(ncf);
+        if (path != NULL)
+            return path;
+    }
+
+    path = find_ifcfg_path_by_device(ncf, name);
+    ERR_BAIL(ncf);
+
+    return path;
+ error:
+    FREE(path);
+    return NULL;
+}
+
+/* Given NDEVS path to DEVICE entries which may contain duplicate devices,
+ * produce a list of canonical paths to the interfaces in INTF and return
+ * the number of entries. Return -1 on error
+ */
+static int uniq_ifcfg_paths(struct netcf *ncf,
+                            int ndevs, char **devs,
+                            char ***intf) {
+    struct augeas *aug;
+    int r;
+    int ndevnames = 0;
+    const char **devnames = NULL;
+
+    aug = get_augeas(ncf);
+    ERR_BAIL(ncf);
+
+    /* List unique device names */
+    r = ALLOC_N(devnames, ndevs);
+    ERR_NOMEM(r < 0, ncf);
+
+    for (int i=0; i < ndevs; i++) {
+        const char *name = NULL;
+        r = aug_get(aug, devs[i], &name);
+        ERR_COND_BAIL(r != 1, ncf, EOTHER);
+        int exists = 0;
+        for (int j = 0; j < ndevnames; j++)
+            if (STREQ(name, devnames[j])) {
+                exists = 1;
+                break;
+            }
+        if (!exists)
+            devnames[ndevnames++] = name;
+    }
+    qsort(devnames, ndevnames, sizeof(*devnames), cmpstrp);
+
+    /* Find canonical config for each device name */
+    r = ALLOC_N(*intf, ndevnames);
+    ERR_NOMEM(r < 0, ncf);
+    for (int i= 0; i < ndevnames; i++) {
+        (*intf)[i] = find_ifcfg_path(ncf, devnames[i]);
+        ERR_BAIL(ncf);
+    }
+
+    FREE(devnames);
+    return ndevnames;
+
+ error:
+    FREE(devnames);
+    free_matches(ndevnames, intf);
+    return -1;
+}
+
+/* List all configured network devices; returns the number of devices or -1
+ * on error. On success, the path to the config file for each interface
+ * is returned in INTF
+ */
+static int list_ifcfg_paths(struct netcf *ncf, char ***intf) {
+    int result = 0, ndevs;
+    char **devs = NULL;
+
+    ndevs = aug_fmt_match(ncf, &devs, "%s/DEVICE", ifcfg_path);
+    ERR_COND_BAIL(ndevs < 0, ncf, EOTHER);
+
+    result = uniq_ifcfg_paths(ncf, ndevs, devs, intf);
+    ERR_BAIL(ncf);
+
+    free_matches(ndevs, &devs);
+    return result;
+
+ error:
+    free_matches(ndevs, &devs);
+    return -1;
+}
+
+static int list_interfaces(struct netcf *ncf, char ***intf) {
+    int nint = 0, result = 0;
+    struct augeas *aug = NULL;
+
+    aug = get_augeas(ncf);
+    ERR_BAIL(ncf);
+
+    /* Look in augeas for all interfaces */
+    nint = list_ifcfg_paths(ncf, intf);
+    ERR_BAIL(ncf);
+    result = nint;
+
+    /* Filter out the interfaces that are slaves/subordinate */
+    for (int i = 0; i < result;) {
+        if (is_slave(ncf, (*intf)[i])) {
+            FREE((*intf)[i]);
+            memmove(*intf + i, *intf + i + 1,
+                    (nint - (i + 1))*sizeof((*intf)[0]));
+            result -= 1;
+        } else {
+            i += 1;
+        }
+    }
+    return result;
+ error:
+    free_matches(nint, intf);
+    return -1;
+}
+
+int drv_init(struct netcf *ncf) {
+    int r;
+    struct stat stats;
+
+    if (ALLOC(ncf->driver) < 0)
+        return -1;
+
+    ncf->driver->ioctl_fd = -1;
+
+    r = add_augeas_xfm_table(ncf, &augeas_xfm_common);
+    if (r < 0)
+        goto error;
+
+    if (stat(ncf->root, &stats) != 0 || !S_ISDIR(stats.st_mode)) {
+        report_error(ncf, NETCF_EFILE,
+                     "invalid root '%s' is not a directory",
ncf->root);
+        return -1;
+    }
+
+    // FIXME: Check for errors
+    xsltInit();
+    exsltStrRegister();
+    ncf->driver->get = parse_stylesheet(ncf, "initscripts-get.xsl");
+    ncf->driver->put = parse_stylesheet(ncf, "initscripts-put.xsl");
+    ncf->driver->rng = rng_parse(ncf, "interface.rng");
+    ERR_BAIL(ncf);
+
+    /* open a socket for interface ioctls */
+    ncf->driver->ioctl_fd = init_ioctl_fd(ncf);
+    if (ncf->driver->ioctl_fd < 0)
+        goto error;
+    if (netlink_init(ncf) < 0)
+        goto error;
+    return 0;
+
+ error:
+    drv_close(ncf);
+    return -1;
+}
+
+void drv_close(struct netcf *ncf) {
+    if (ncf == NULL || ncf->driver == NULL)
+        return;
+    xsltFreeStylesheet(ncf->driver->get);
+    xsltFreeStylesheet(ncf->driver->put);
+    xmlRelaxNGFree(ncf->driver->rng);
+    netlink_close(ncf);
+    if (ncf->driver->ioctl_fd >= 0)
+        close(ncf->driver->ioctl_fd);
+    aug_close(ncf->driver->augeas);
+    FREE(ncf->driver->augeas_xfm_tables);
+    FREE(ncf->driver);
+}
+
+void drv_entry(struct netcf *ncf) {
+    ncf->driver->load_augeas = 1;
+}
+
+static int list_interface_ids(struct netcf *ncf,
+                              int maxnames, char **names,
+                              unsigned int flags,
+                              const char *id_attr) {
+    struct augeas *aug = NULL;
+    int nint = 0, nmatches = 0, nqualified = 0, result = 0, r;
+    char **intf = NULL, **matches = NULL;
+
+    aug = get_augeas(ncf);
+    ERR_BAIL(ncf);
+    nint = list_interfaces(ncf, &intf);
+    ERR_BAIL(ncf);
+    if (!names) {
+        maxnames = nint;    /* if not returning list, ignore maxnames too */
+    }
+    for (result = 0; (result < nint) && (nqualified < maxnames); result++)
{
+        nmatches = aug_fmt_match(ncf, &matches,
+                                 "%s/%s", intf[result], id_attr);
+        ERR_BAIL(ncf);
+        if (nmatches > 0) {
+            const char *name;
+            int is_qualified = ((flags & (NETCF_IFACE_ACTIVE|NETCF_IFACE_INACTIVE))
+                                == (NETCF_IFACE_ACTIVE|NETCF_IFACE_INACTIVE));
+
+            r = aug_get(aug, matches[nmatches-1], &name);
+            ERR_COND_BAIL(r < 0, ncf, EOTHER);
+
+            if (!is_qualified) {
+                int is_active = if_is_active(ncf, name);
+                if ((is_active && (flags & NETCF_IFACE_ACTIVE))
+                    || ((!is_active) && (flags & NETCF_IFACE_INACTIVE))) {
+
+                    is_qualified = 1;
+                }
+            }
+
+            if (is_qualified) {
+                if (names) {
+                    names[nqualified] = strdup(name);
+                    ERR_NOMEM(names[nqualified] == NULL, ncf);
+                }
+                nqualified++;
+            }
+        }
+        free_matches(nmatches, &matches);
+    }
+    free_matches(nint, &intf);
+    return nqualified;
+ error:
+    free_matches(nmatches, &matches);
+    free_matches(nint, &intf);
+    return -1;
+}
+
+int drv_list_interfaces(struct netcf *ncf, int maxnames, char **names,
+        unsigned int flags) {
+    return list_interface_ids(ncf, maxnames, names, flags, "DEVICE");
+}
+
+int drv_num_of_interfaces(struct netcf *ncf, unsigned int flags) {
+    return list_interface_ids(ncf, 0, NULL, flags, "DEVICE");
+}
+
+struct netcf_if *drv_lookup_by_name(struct netcf *ncf, const char *name) {
+    struct netcf_if *nif = NULL;
+    char *pathx = NULL;
+    char *name_dup = NULL;
+    struct augeas *aug;
+
+    aug = get_augeas(ncf);
+    ERR_BAIL(ncf);
+
+    pathx = find_ifcfg_path(ncf, name);
+    ERR_BAIL(ncf);
+
+    if (pathx == NULL || is_slave(ncf, pathx))
+        goto done;
+
+    name_dup = strdup(name);
+    ERR_NOMEM(name_dup == NULL, ncf);
+
+    nif = make_netcf_if(ncf, name_dup);
+    ERR_BAIL(ncf);
+    goto done;
+
+ error:
+    unref(nif, netcf_if);
+    FREE(name_dup);
+ done:
+    FREE(pathx);
+    return nif;
+}
+
+/* Get an XML desription of the interfaces (just paths, really) in INTF.
+ * The format is a very simple representation of the Augeas tree (see
+ * xml/augeas.rng)
+ */
+static xmlDocPtr aug_get_xml(struct netcf *ncf, int nint, char **intf) {
+    struct augeas *aug;
+    xmlDocPtr result = NULL;
+    xmlNodePtr root = NULL, tree = NULL;
+    char **matches = NULL;
+    int nmatches, r;
+
+    aug = get_augeas(ncf);
+    ERR_BAIL(ncf);
+
+    result = xmlNewDoc(BAD_CAST "1.0");
+    root = xmlNewNode(NULL, BAD_CAST "forest");
+    xmlDocSetRootElement(result, root);
+
+    for (int i=0; i < nint; i++) {
+        tree = xmlNewChild(root, NULL, BAD_CAST "tree", NULL);
+        xmlNewProp(tree, BAD_CAST "path", BAD_CAST intf[i]);
+        nmatches = aug_fmt_match(ncf, &matches, "%s/%s", intf[i],
"*");
+        ERR_COND_BAIL(nint < 0, ncf, EOTHER);
+        for (int j = 0; j < nmatches; j++) {
+            xmlNodePtr node = xmlNewChild(tree, NULL, BAD_CAST "node", NULL);
+            const char *value;
+            xmlNewProp(node, BAD_CAST "label",
+                       BAD_CAST matches[j] + strlen(intf[i]) + 1);
+            r = aug_get(aug, matches[j], &value);
+            ERR_COND_BAIL(r < 0, ncf, EOTHER);
+            xmlNewProp(node, BAD_CAST "value", BAD_CAST value);
+        }
+        free_matches(nmatches, &matches);
+    }
+
+    return result;
+
+ error:
+    free_matches(nmatches, &matches);
+    xmlFreeDoc(result);
+    return NULL;
+}
+
+/* Write the XML doc in the simple Augeas format into the Augeas tree */
+static int aug_put_xml(struct netcf *ncf, xmlDocPtr xml) {
+    xmlNodePtr forest;
+    char *path = NULL, *lpath = NULL, *label = NULL, *value = NULL;
+    struct augeas *aug = NULL;
+    int result = -1;
+    int r;
+
+    aug = get_augeas(ncf);
+    ERR_BAIL(ncf);
+
+    forest = xmlDocGetRootElement(xml);
+    ERR_THROW(forest == NULL, ncf, EINTERNAL, "missing root element");
+    ERR_THROW(! xmlStrEqual(forest->name, BAD_CAST "forest"), ncf,
+              EINTERNAL, "expected root node labeled 'forest', not
'%s'",
+              forest->name);
+    list_for_each(tree, forest->children) {
+        ERR_THROW(! xmlStrEqual(tree->name, BAD_CAST "tree"), ncf,
+                  EINTERNAL, "expected node labeled 'tree', not
'%s'",
+                  tree->name);
+        path = xml_prop(tree, "path");
+        int toplevel = 1;
+        /* This is a little drastic, since it clears out the file entirely */
+        r = aug_rm(aug, path);
+        ERR_THROW(r < 0, ncf, EINTERNAL, "aug_rm of '%s' failed",
path);
+        list_for_each(node, tree->children) {
+            label = xml_prop(node, "label");
+            value = xml_prop(node, "value");
+            /* We should mark the toplevel interface from the XSLT */
+            if (STREQ(label, "BRIDGE") || STREQ(label, "MASTER")) {
+                toplevel = 0;
+            }
+            r = xasprintf(&lpath, "%s/%s", path, label);
+            ERR_NOMEM(r < 0, ncf);
+
+            r = aug_set(aug, lpath, value);
+            ERR_THROW(r < 0, ncf, EOTHER,
+                      "aug_set of '%s' failed", lpath);
+            FREE(lpath);
+            xmlFree(label);
+            xmlFree(value);
+            label = value = NULL;
+        }
+        xmlFree(path);
+        path = NULL;
+    }
+    result = 0;
+ error:
+    xmlFree(label);
+    xmlFree(value);
+    xmlFree(path);
+    FREE(lpath);
+    return result;
+}
+
+/* given a netcf_if, get the config for an interface in the simple
+ * Augeas format
+ */
+static xmlDocPtr aug_get_xml_for_nif(struct netcf_if *nif) {
+    struct netcf *ncf;
+    char **devs = NULL, **intf = NULL;
+    xmlDocPtr aug_xml = NULL;
+    int ndevs = 0, nint = 0;
+
+    ncf = nif->ncf;
+    ndevs = aug_fmt_match(ncf, &devs,
+              "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER =
'%s'"
+              "    or MASTER = ../*[BRIDGE = '%s']/DEVICE ]/DEVICE",
+              ifcfg_path, nif->name, nif->name, nif->name, nif->name);
+    ERR_BAIL(ncf);
+
+    nint = uniq_ifcfg_paths(ncf, ndevs, devs, &intf);
+    ERR_BAIL(ncf);
+
+    aug_xml = aug_get_xml(ncf, nint, intf);
+
+ error:
+    free_matches(ndevs, &devs);
+    free_matches(nint, &intf);
+    return aug_xml;
+}
+
+/* return the current static configuration (as saved on disk) */
+char *drv_xml_desc(struct netcf_if *nif) {
+    char *result = NULL;
+    struct netcf *ncf;
+    xmlDocPtr aug_xml = NULL;
+
+    ncf = nif->ncf;
+    aug_xml = aug_get_xml_for_nif(nif);
+    ERR_BAIL(ncf);
+
+    result = apply_stylesheet_to_string(ncf, ncf->driver->put, aug_xml);
+
+ error:
+    xmlFreeDoc(aug_xml);
+    return result;
+}
+
+/* return the current live configuration state - a combination of
+ * drv_xml_desc + results of querying the interface directly */
+
+char *drv_xml_state(struct netcf_if *nif) {
+    char *result = NULL;
+    int r, result_len;
+    struct netcf *ncf;
+    xmlDocPtr ncf_xml = NULL;
+    xmlNodePtr root;
+
+    ncf = nif->ncf;
+
+    /* start out with an empty tree rather than the config tree. Just
+     * put in the interface node and its name
+     */
+    ncf_xml = xmlNewDoc(BAD_CAST "1.0");
+    ERR_NOMEM(ncf_xml == NULL, ncf);
+    root = xmlNewNode(NULL, BAD_CAST "interface");
+    ERR_NOMEM(root == NULL, ncf);
+    xmlDocSetRootElement(ncf_xml, root);
+
+    /* add all info we can gather from the kernel/sysfs/procfs */
+    add_state_to_xml_doc(nif, ncf_xml);
+    ERR_BAIL(ncf);
+
+    r = xsltSaveResultToString((xmlChar **)&result, &result_len,
+                               ncf_xml, ncf->driver->put);
+    ERR_NOMEM(r < 0, ncf);
+
+ done:
+    xmlFreeDoc(ncf_xml);
+    return result;
+ error:
+    FREE(result);
+    result = 0;
+    goto done;
+}
+
+/* Report various status info about the interface as bits in
+ * "flags". Returns 0 on success, -1 on failure
+ */
+int drv_if_status(struct netcf_if *nif, unsigned int *flags) {
+    int is_active;
+
+    ERR_THROW(flags == NULL, nif->ncf, EOTHER, "NULL pointer for flags in
ncf_if_status");
+    *flags = 0;
+    is_active = if_is_active(nif->ncf, nif->name);
+    if (is_active)
+        *flags |= NETCF_IFACE_ACTIVE;
+    else
+        *flags |= NETCF_IFACE_INACTIVE;
+    return 0;
+error:
+    return -1;
+}
+
+/* Get the content of /interface/@name. Result must be freed with xmlFree()
+ *
+ * The name on VLAN interfaces is optional; if there is no
+ * /interface/@name, construct a name for the VLAN interface and set
+ * /interface/@name in NCF_XML to it. This way, other code can assume we
+ * always have a name on the interface.
+ */
+static char *device_name_from_xml(struct netcf *ncf, xmlDocPtr ncf_xml) {
+    xmlXPathContextPtr context = NULL;
+	xmlXPathObjectPtr obj = NULL;
+    char *result = NULL;
+
+	context = xmlXPathNewContext(ncf_xml);
+    ERR_NOMEM(context == NULL, ncf);
+
+	obj = xmlXPathEvalExpression(BAD_CAST "string(/interface/@name)", context);
+    ERR_NOMEM(obj == NULL, ncf);
+    assert(obj->type == XPATH_STRING);
+
+    if (xmlStrlen(obj->stringval) == 0) {
+        xmlXPathFreeObject(obj);
+        obj = xmlXPathEvalExpression(BAD_CAST
+         "concat(/interface/vlan/interface/@name, '.',
/interface/vlan/@tag)",
+        context);
+        ERR_NOMEM(obj == NULL, ncf);
+        ERR_COND_BAIL(xmlStrlen(obj->stringval) == 0, ncf, EINTERNAL);
+        assert(obj->type == XPATH_STRING);
+
+        xmlNodePtr iface;
+        iface = xmlDocGetRootElement(ncf_xml);
+        ERR_COND_BAIL(iface == NULL, ncf, EINTERNAL);
+        xmlSetProp(iface, BAD_CAST "name", BAD_CAST result);
+    }
+
+    result = (char *) xmlStrdup(obj->stringval);
+ error:
+    xmlXPathFreeObject(obj);
+    xmlXPathFreeContext(context);
+    return result;
+}
+
+/* The device NAME is a bond if it is mentioned as the MASTER in sopme
+ * other devices config file
+ */
+static bool is_bond(struct netcf *ncf, const char *name) {
+    int nmatches = 0;
+
+    nmatches = aug_fmt_match(ncf, NULL,
+                             "%s[ MASTER = '%s']", ifcfg_path, name);
+    return nmatches > 0;
+}
+
+/* The device NAME is a bridge if it has an entry TYPE=Bridge */
+static bool is_bridge(struct netcf *ncf, const char *name) {
+    int nmatches = 0;
+
+    nmatches = aug_fmt_match(ncf, NULL,
+                             "%s[ DEVICE = '%s' and TYPE =
'Bridge']",
+                             ifcfg_path, name);
+    return nmatches > 0;
+}
+
+static int bridge_slaves(struct netcf *ncf, const char *name, char ***slaves) {
+    struct augeas *aug = NULL;
+    int r, nslaves = 0;
+
+    aug = get_augeas(ncf);
+    ERR_BAIL(ncf);
+
+    nslaves = aug_fmt_match(ncf, slaves,
+                            "%s[ BRIDGE = '%s' ]/DEVICE", ifcfg_path,
name);
+    ERR_BAIL(ncf);
+    for (int i=0; i < nslaves; i++) {
+        char *p = (*slaves)[i];
+        const char *dev;
+        r = aug_get(aug, p, &dev);
+        ERR_COND_BAIL(r < 0, ncf, EOTHER);
+
+        (*slaves)[i] = strdup(dev);
+        free(p);
+        ERR_NOMEM(slaves[i] == NULL, ncf);
+    }
+    return nslaves;
+ error:
+    free_matches(nslaves, slaves);
+    return -1;
+}
+
+
+/* For an interface NAME, remove the ifcfg-* files for that interface and
+ * all its slaves. */
+static void rm_interface(struct netcf *ncf, const char *name) {
+    int r;
+    char *path = NULL;
+    struct augeas *aug = NULL;
+
+    aug = get_augeas(ncf);
+    ERR_BAIL(ncf);
+
+    /* The last or clause catches slaves of a bond that are enslaved to
+     * a bridge NAME */
+    r = xasprintf(&path,
+          "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER =
'%s' "
+          "    or MASTER = ../*[BRIDGE = '%s']/DEVICE ]",
+                  ifcfg_path, name, name, name, name);
+    ERR_NOMEM(r < 0, ncf);
+
+    r = aug_rm(aug, path);
+    ERR_COND_BAIL(r < 0, ncf, EOTHER);
+ error:
+    FREE(path);
+}
+
+/* Remove all interfaces and their slaves mentioned in NCF_XML.  We need to
+ * remove interfaces one by one when we define an interface, since what
+ * will become a subinterface may not be related to the new toplevel
+ * interface, and calling RM_INTERFACE on the toplevel interface is
+ * therefore not enough.
+ */
+static void rm_all_interfaces(struct netcf *ncf, xmlDocPtr ncf_xml) {
+    xmlXPathContextPtr context = NULL;
+	xmlXPathObjectPtr obj = NULL;
+
+	context = xmlXPathNewContext(ncf_xml);
+    ERR_NOMEM(context == NULL, ncf);
+
+    obj = xmlXPathEvalExpression(BAD_CAST
+                                 "//interface[count(parent::vlan) = 0]",
+                                 context);
+    ERR_NOMEM(obj == NULL, ncf);
+
+
+    xmlNodeSetPtr ns = obj->nodesetval;
+    for (int i=0; i < ns->nodeNr; i++) {
+        xmlChar *name = xmlGetProp(ns->nodeTab[i], BAD_CAST "name");
+        ERR_NOMEM(name == NULL, ncf);
+        rm_interface(ncf, (char *) name);
+        xmlFree(name);
+        ERR_BAIL(ncf);
+	}
+ error:
+    xmlXPathFreeObject(obj);
+    xmlXPathFreeContext(context);
+}
+
+/* Dig through interface NAME and all its subinterfaces for bonds
+ * and either add aliases in modprobe.conf for it (ALIAS == true), or
+ * remove such aliases (ALIAS == false)
+ */
+static void bond_setup(struct netcf *ncf, const char *name, bool alias) {
+    void (*setup)(struct netcf *ncf, const char *name);
+    int nslaves = 0;
+    char **slaves = NULL;
+
+    if (alias)
+        setup = modprobed_alias_bond;
+    else
+        setup = modprobed_unalias_bond;
+
+    if (is_bond(ncf, name)) {
+        setup(ncf, name);
+        ERR_BAIL(ncf);
+    }
+
+    if (is_bridge(ncf, name)) {
+        nslaves = bridge_slaves(ncf, name, &slaves);
+        ERR_BAIL(ncf);
+        for (int i=0; i < nslaves; i++) {
+            if (is_bond(ncf, slaves[i])) {
+                setup(ncf, slaves[i]);
+                ERR_BAIL(ncf);
+            }
+        }
+    }
+
+ error:
+    free_matches(nslaves, &slaves);
+    return;
+}
+
+struct netcf_if *drv_define(struct netcf *ncf, const char *xml_str) {
+    xmlDocPtr ncf_xml = NULL, aug_xml = NULL;
+    char *name = NULL;
+    struct netcf_if *result = NULL;
+    int r;
+    struct augeas *aug = get_augeas(ncf);
+
+    ncf_xml = parse_xml(ncf, xml_str);
+    ERR_BAIL(ncf);
+
+    rng_validate(ncf, ncf_xml);
+    ERR_BAIL(ncf);
+
+    name = device_name_from_xml(ncf, ncf_xml);
+    ERR_COND_BAIL(name == NULL, ncf, EINTERNAL);
+
+    rm_all_interfaces(ncf, ncf_xml);
+    ERR_BAIL(ncf);
+
+    aug_xml = apply_stylesheet(ncf, ncf->driver->get, ncf_xml);
+    ERR_BAIL(ncf);
+
+    aug_put_xml(ncf, aug_xml);
+    ERR_BAIL(ncf);
+
+    bond_setup(ncf, name, true);
+    ERR_BAIL(ncf);
+
+    r = aug_save(aug);
+    if (r < 0 && NCF_DEBUG(ncf)) {
+        fprintf(stderr, "Errors from aug_save:\n");
+        aug_print(aug, stderr, "/augeas//error");
+    }
+    ERR_THROW(r < 0, ncf, EOTHER, "aug_save failed");
+
+    result = make_netcf_if(ncf, name);
+    ERR_BAIL(ncf);
+
+ done:
+    xmlFreeDoc(ncf_xml);
+    xmlFreeDoc(aug_xml);
+    return result;
+ error:
+    unref(result, netcf_if);
+    goto done;
+}
+
+int drv_undefine(struct netcf_if *nif) {
+    struct augeas *aug = NULL;
+    struct netcf *ncf = nif->ncf;
+    int r;
+
+    aug = get_augeas(ncf);
+    ERR_BAIL(ncf);
+
+    bond_setup(ncf, nif->name, false);
+    ERR_BAIL(ncf);
+
+    rm_interface(ncf, nif->name);
+    ERR_BAIL(ncf);
+
+    r = aug_save(aug);
+    ERR_COND_BAIL(r < 0, ncf, EOTHER);
+
+    return 0;
+ error:
+    return -1;
+}
+
+int drv_lookup_by_mac_string(struct netcf *ncf, const char *mac,
+                             int maxifaces, struct netcf_if **ifaces)
+{
+    struct augeas *aug = NULL;
+    char *path = NULL, *ifcfg = NULL;
+    const char **names = NULL;
+    int nmatches = 0;
+    char **matches = NULL;
+    int r;
+    int result = -1;
+
+    MEMZERO(ifaces, maxifaces);
+
+    aug = get_augeas(ncf);
+    ERR_BAIL(ncf);
+
+    nmatches = aug_match_mac(ncf, mac, &matches);
+    ERR_BAIL(ncf);
+    if (nmatches == 0) {
+        result = 0;
+        goto done;
+    }
+
+    r = ALLOC_N(names, nmatches);
+    ERR_NOMEM(r < 0, ncf);
+
+    int cnt = 0;
+    for (int i = 0; i < nmatches; i++) {
+        if (!has_ifcfg_file(ncf, matches[i]))
+            continue;
+        r = xasprintf(&ifcfg, "%s[DEVICE = '%s']", ifcfg_path,
matches[i]);
+        ERR_NOMEM(r < 0, ncf);
+
+        if (! is_slave(ncf, ifcfg))
+            names[cnt++] = matches[i];
+        FREE(ifcfg);
+    }
+    for (int i=0; i < cnt && i < maxifaces; i++) {
+        char *name = strdup(names[i]);
+        ERR_NOMEM(name == NULL, ncf);
+        ifaces[i] = make_netcf_if(ncf, name);
+        ERR_BAIL(ncf);
+    }
+    result = cnt;
+    goto done;
+
+ error:
+    for (int i=0; i < maxifaces; i++)
+        unref(ifaces[i], netcf_if);
+ done:
+    free(names);
+    free(ifcfg);
+    free(path);
+    free_matches(nmatches, &matches);
+    return result;
+}
+
+const char *drv_mac_string(struct netcf_if *nif) {
+    struct netcf *ncf = nif->ncf;
+    const char *mac;
+    char *path = NULL;
+    int r;
+
+    r = aug_get_mac(ncf, nif->name, &mac);
+    ERR_THROW(r < 0, ncf, EOTHER, "could not lookup MAC of %s",
nif->name);
+
+    if (mac != NULL) {
+        if (nif->mac == NULL || STRNEQ(nif->mac, mac)) {
+            FREE(nif->mac);
+            nif->mac = strdup(mac);
+            ERR_NOMEM(nif->mac == NULL, ncf);
+        }
+    } else {
+        FREE(nif->mac);
+    }
+    /* fallthrough intentional */
+ error:
+    FREE(path);
+    return nif->mac;
+}
+
+/*
+ * Bringing interfaces up/down
+ */
+
+int drv_if_up(struct netcf_if *nif) {
+    static const char *const ifup = "ifup";
+    struct netcf *ncf = nif->ncf;
+    char **slaves = NULL;
+    int nslaves = 0;
+    int result = -1;
+
+    if (is_bridge(ncf, nif->name)) {
+        /* Bring up bridge slaves before the bridge */
+        nslaves = bridge_slaves(ncf, nif->name, &slaves);
+        ERR_BAIL(ncf);
+
+        for (int i=0; i < nslaves; i++) {
+            run1(ncf, ifup, slaves[i]);
+            ERR_BAIL(ncf);
+        }
+    }
+    run1(ncf, ifup, nif->name);
+    ERR_BAIL(ncf);
+    result = 0;
+ error:
+    free_matches(nslaves, &slaves);
+    return result;
+}
+
+int drv_if_down(struct netcf_if *nif) {
+    static const char *const ifdown = "ifdown";
+    struct netcf *ncf = nif->ncf;
+    char **slaves = NULL;
+    int nslaves = 0;
+    int result = -1;
+
+    run1(ncf, ifdown, nif->name);
+    ERR_BAIL(ncf);
+    if (is_bridge(ncf, nif->name)) {
+        /* Bring up bridge slaves after the bridge */
+        nslaves = bridge_slaves(ncf, nif->name, &slaves);
+        ERR_BAIL(ncf);
+
+        for (int i=0; i < nslaves; i++) {
+            run1(ncf, ifdown, slaves[i]);
+            ERR_BAIL(ncf);
+        }
+    }
+    result = 0;
+ error:
+    free_matches(nslaves, &slaves);
+    return result;
+}
+
+/*
+ * Test interface
+ */
+int drv_get_aug(struct netcf *ncf, const char *ncf_xml, char **aug_xml) {
+    /* Use utility implementation */
+    return dutil_get_aug(ncf, ncf_xml, aug_xml);
+}
+
+/* Transform the Augeas XML AUG_XML into interface XML NCF_XML */
+int drv_put_aug(struct netcf *ncf, const char *aug_xml, char **ncf_xml) {
+    /* Use utility implementation */
+    return dutil_put_aug(ncf, aug_xml, ncf_xml);
+}
+
+/*
+ * Local variables:
+ *  indent-tabs-mode: nil
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ *  tab-width: 4
+ * End:
+ */
+/* vim: set ts=4 sw=4 et: */
-- 
1.7.2.3

[Laine Stump]

On 11/15/2010 12:41 PM, Adam Stokes wrote:
>  Rename drv_initscripts driver backend to indicate this being a Linux
> only set of routines.
>  ---
>    src/Makefile.am       |    2 +-
>    src/drv_initscripts.c | 1097 -------------------------------------------------
>    src/drv_linux.c       | 1097 +++++++++++++++++++++++++++++++++++++++++++++++++
>    3 files changed, 1098 insertions(+), 1098 deletions(-)
>    delete mode 100644 src/drv_initscripts.c
>    create mode 100644 src/drv_linux.c 

Actually, drv_initscripts.c is more specific (and more correct) than 
drv_linux.c. That file will only work on those linux platforms that use 
individual ifcfg-* files (powered by initscripts) to configure their 
interfaces. This includes Fedora, RHEL, and SuSE, and (m)any derivatives 
of them (it will require some modifications to work on SuSE, but 
somebody has done that and is working on patches to submit).

Many other Linux platforms will *not* work with drv_initscripts, eg 
debian, ubuntu, gentoo - they use a single config file in a completely 
different format.

In the meantime, after reviewing your patches last week, I noticed there 
are some functions in "suboptimal" places that should be moved around 
(eg, the unix run_program function is in netcf.c, which really should be 
platform-independent). Last week I had a quick go at moving things 
around to be better organized along platform lines, but had to take a 
break and go back to some libvirt work. I'll try and go back to that 
this week, as it may simplify your work.

[Adam Stokes]

On Mon, 15 Nov 2010 16:47:01 -0500
Laine Stump <laine(a)laine.org&gt; wrote:

>  
>  In the meantime, after reviewing your patches last week, I noticed
>  there are some functions in "suboptimal" places that should be moved
>  around (eg, the unix run_program function is in netcf.c, which really
>  should be platform-independent). Last week I had a quick go at moving
>  things around to be better organized along platform lines, but had to
>  take a break and go back to some libvirt work. I'll try and go back
>  to that this week, as it may simplify your work. 
Thanks Laine, anything committed yet and is there anything I can do to help?

[Laine Stump]

On 11/16/2010 08:32 AM, Adam Stokes wrote:
>  On Mon, 15 Nov 2010 16:47:01 -0500
>  Laine Stump<laine(a)laine.org>  wrote:
>
> > In the meantime, after reviewing your patches last week, I noticed
> > there are some functions in "suboptimal" places that should be moved
> > around (eg, the unix run_program function is in netcf.c, which really
> > should be platform-independent). Last week I had a quick go at moving
> > things around to be better organized along platform lines, but had to
> > take a break and go back to some libvirt work. I'll try and go back
> > to that this week, as it may simplify your work.
>  Thanks Laine, anything committed yet and is there anything I can do to help? 
I'm going through it again now to clean up some more stuff. I don't know 
yet how comfortable I'll be with the amount of code thrash though :-/

One question: Do you have libxml2 available on Windows? I want to put 
the "rng" member of the driver object into the netcf object, since it 
seems to be something that will be useful no matter which platform is 
being used.

[Adam Stokes]

On Tue, 16 Nov 2010 13:29:09 -0500
Laine Stump <laine(a)laine.org&gt; wrote:


>  One question: Do you have libxml2 available on Windows? I want to put
>
>  the "rng" member of the driver object into the netcf object, since it 
>  seems to be something that will be useful no matter which platform is 
>  being used. 
For reference, mingw32 provides both xml2 and xslt :)

Thanks,
Adam