netcf-pld_interfaces.patch

   1 --- netcf-0.2.2/src/drv_redhat.c.orig   2012-08-01 05:12:43.000000000 +0200
   2 +++ netcf-0.2.2/src/drv_redhat.c        2012-08-29 19:49:20.078576458 +0200
   3 @@ -52,14 +52,14 @@
   4      "/files/etc/sysconfig/network-scripts";
   5
   6  static const char *const ifcfg_path =
   7 -    "/files/etc/sysconfig/network-scripts/*";
   8 +    "/files/etc/sysconfig/interfaces/*";
   9
  10  /* Augeas should only load the files we are interested in */
  11  static const struct augeas_pv augeas_xfm_common_pv[] = {
  12      /* Ifcfg files */
  13      { "/augeas/load/Ifcfg/lens", "Sysconfig.lns" },
  14      { "/augeas/load/Ifcfg/incl",
  15 -      "/etc/sysconfig/network-scripts/ifcfg-*" },
  16 +      "/etc/sysconfig/interfaces/ifcfg-*" },
  17      { "/augeas/load/Ifcfg/excl[1]", "*~" },
  18      { "/augeas/load/Ifcfg/excl[2]", "*.bak" },
  19      { "/augeas/load/Ifcfg/excl[3]", "*.orig" },
  20 --- netcf-0.2.4/src/netcf-transaction.sh.in.orig        2011-05-20 20:40:22.000000000 +0200
  21 +++ netcf-0.2.4/src/netcf-transaction.sh.in     2011-08-13 09:14:09.519761783 +0200
  22 @@ -30,13 +30,12 @@
  23  sysconfdir="@sysconfdir@"
  24  localstatedir="@localstatedir@"
  25
  26 -netconfdir="$sysconfdir"/sysconfig/network-scripts
  27 +netconfdir="$sysconfdir"/sysconfig/interfaces
  28  snapshotdir="$localstatedir"/lib/netcf/network-snapshot
  29  rollbackdirbase="$localstatedir"/lib/netcf/network-rollback
  30
  31  # Source function library.
  32 -test ! -r "$sysconfdir"/rc.d/init.d/functions ||
  33 -    . "$sysconfdir"/rc.d/init.d/functions
  34 +. "$sysconfdir"/rc.d/init.d/functions
  35
  36  # take a snapshot of current network configuration scripts
  37  change_begin ()
  38 @@ -195,8 +194,8 @@
  39  # usage [val]
  40  # Display usage string, then exit with VAL (defaults to 2).
  41  usage() {
  42 -    echo $"Usage: $0 {change-begin|change-commit|change-rollback|snapshot-dir|start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
  43 -    exit ${1-2}
  44 +    msg_usage "$0 {change-begin|change-commit|change-rollback|snapshot-dir|start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
  45 +    exit ${1:-2}
  46  }
  47
  48  # See how we were called.
  49 @@ -208,7 +207,7 @@
  50  case "$1" in
  51      # commands required in all Fedora initscripts
  52      start|restart|reload|force-reload|condrestart|try-restart)
  53 -        echo -n $"Running $prog $1: "
  54 +        nls "Forcing network configuration rollback"
  55          change_rollback
  56          # ignore the "no pending transaction" error
  57          test "$retval" != "$EINVALID_IN_THIS_STATE" && retval=$?
  58 @@ -217,9 +216,9 @@
  59      stop|status)
  60          if test -d "$snapshotdir"
  61          then
  62 -            echo $"There is an open transaction"
  63 +            nls "There is an open transaction"
  64          else
  65 -            echo $"No open transaction"
  66 +            nls "No open transaction"
  67          fi
  68          ;;
  69