Author: mvidner
Date: Tue Aug 12 12:45:02 2008
New Revision: 49978
URL: http://svn.opensuse.org/viewcvs/yast?rev=49978&view=rev
Log:
Use /etc/sysconfig/network-scripts/ifcfg-* instead of
/etc/sysconfig/network/ifcfg-* if it exists (eg. on Fedora).
Merging a part of a patch from Oracle:
http://lists.opensuse.org/yast-devel/2008-07/msg00016.html
Added:
trunk/yast2/library/network/agents/network.scr.in (contents, props changed)
- copied, changed from r48977, trunk/yast2/library/network/agents/network.scr
Removed:
trunk/yast2/library/network/agents/network.scr
Modified:
trunk/yast2/configure.in.in
trunk/yast2/library/network/agents/Makefile.am
Modified: trunk/yast2/configure.in.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/configure.in.in?rev=49978&r1=49977&r2=49978&view=diff
==============================================================================
--- trunk/yast2/configure.in.in (original)
+++ trunk/yast2/configure.in.in Tue Aug 12 12:45:02 2008
@@ -18,7 +18,20 @@
@YAST2-CHECKS-YCP@
@YAST2-CHECKS-TESTSUITE@
+AC_MSG_CHECKING([for ifcfg location])
+# fallback, default on openSUSE
+IFCFG_DIR=/etc/sysconfig/network
+for TRY in /etc/sysconfig/network-scripts; do
+ if test -d $TRY; then
+ IFCFG_DIR=$TRY
+ break
+ fi
+done
+AC_SUBST([IFCFG_DIR])
+AC_MSG_RESULT([$IFCFG_DIR])
+
## and generate the output
# also done via makefile
-AC_CONFIG_FILES(./library/modules/Version.ycp)
+AC_CONFIG_FILES(library/modules/Version.ycp
+library/network/agents/network.scr)
@YAST2-OUTPUT@
Modified: trunk/yast2/library/network/agents/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/agents/Makefile.am?rev=49978&r1=49977&r2=49978&view=diff
==============================================================================
--- trunk/yast2/library/network/agents/Makefile.am (original)
+++ trunk/yast2/library/network/agents/Makefile.am Tue Aug 12 12:45:02 2008
@@ -2,6 +2,6 @@
# Makefile.am for network/ifcfg agent
#
-scrconf_DATA = $(wildcard *.scr)
+scrconf_DATA = sysconfig_SuSEfirewall2.scr network.scr
-EXTRA_DIST = $(scrconf_DATA)
+EXTRA_DIST = sysconfig_SuSEfirewall2.scr network.scr.in
Copied: trunk/yast2/library/network/agents/network.scr.in (from r48977, trunk/yast2/library/network/agents/network.scr)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/agents/network.scr.in?p2=trunk/yast2/library/network/agents/network.scr.in&p1=trunk/yast2/library/network/agents/network.scr&r1=48977&r2=49978&rev=49978&view=diff
==============================================================================
--- trunk/yast2/library/network/agents/network.scr (original)
+++ trunk/yast2/library/network/agents/network.scr.in Tue Aug 12 12:45:02 2008
@@ -1,7 +1,9 @@
+// @configure_input@
/**
* File: network.scr
- * Summary: Agent for /etc/sysconfig/network/ifcfg-*
+ * Summary: Agent for @IFCFG_DIR@/ifcfg-*
* Author: Michal Svec