- skrypty sieciowe w network-scripts

- ipchains poniechane (jak ktoś chce to niech wsadzi w oddzielny moduł)
- net-scripts i rc-scripts połączone w rc-scripts

svn-id: @414

diff --git a/configure.in b/configure.in
index 6b2a3ae8f4d0afdb7036d7d80119855acfe1a81b..c39bff68afa23add803af13c124630ed6a7e5392 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,7 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
 pppdir='${sysconfdir}/ppp'
-networkscriptsdir='${sbindir}'
+networkscriptsdir='${sysconfdir}/network-scripts'
 sysconfigdir='${sysconfdir}/sysconfig'
 rcdir='${sysconfdir}/rc.d'
 docdir="${prefix}/doc/$PACKAGE-$VERSION"

diff --git a/rc-scripts.spec.in b/rc-scripts.spec.in
index 31872e105bf19d619ae46945f1a09b1d03efce3c..d78d6009fa7192acbf05224406086c20c03e37be 100644 (file)
--- a/rc-scripts.spec.in
+++ b/rc-scripts.spec.in
@@ -175,8 +175,8 @@ fi
 %{_mandir}/man1/doexec.1.gz
 %{_mandir}/man1/initlog.1.gz
 
-%files -n net-scripts
-%defattr(644,root,root,754)
+#%files -n net-scripts
+#%defattr(644,root,root,754)
 %doc sysconfig/interfaces/ifc*
 %doc sysconfig/interfaces/tun*
 %doc sysconfig/interfaces/data/chat-ppp*
@@ -189,6 +189,9 @@ fi
 %attr(755,root,root) %dir %{_sysconfdir}/sysconfig/interfaces/data
 %attr(755,root,root) %dir %{_sysconfdir}/ppp
 %attr(755,root,root) %{_sysconfdir}/ppp/*
+%attr(755,root,root) %dir %{_sysconfdir}/network-scripts
+%attr(755,root,root) %{_sysconfdir}/network-scripts/if*
+#%attr(755,root,root) %{_sysconfdir}/network-scripts/tnl*
 
 %attr(644,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/sysconfig/network
 %attr(644,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/sysconfig/static-routes
@@ -205,10 +208,10 @@ fi
 %{_mandir}/man1/usernetctl.1.gz
 %{_mandir}/man1/ipcalc.1.gz
 
-%files -n ipchains-setup
-%defattr(644,root,root,754)
-%doc doc/ipchains-setup.txt.gz
-%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/ipchains
+#%files -n ipchains-setup
+#%defattr(644,root,root,754)
+#%doc doc/ipchains-setup.txt.gz
+#%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/ipchains
 #%attr(755,root,root) %dir %{_sysconfdir}/sysconfig/ipchains.d/
 #%attr(755,root,root) %dir %{_sysconfdir}/sysconfig/interfaces/data
 #%attr(750,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/sysconfig/ipchains.d/*

diff --git a/sysconfig/network-scripts/Makefile.am b/sysconfig/network-scripts/Makefile.am
index 77c332a5496b996735ca888960ebecbd696db6d0..6038e9fbf9adad9eefbf597708779b9974348445 100644 (file)
--- a/sysconfig/network-scripts/Makefile.am
+++ b/sysconfig/network-scripts/Makefile.am
@@ -4,21 +4,22 @@ libdir = @libdir@
 
 sbin_SCRIPTS = \
        ifdown \
+       ifup \
+       tnldown \
+       tnlup
+
+networkscriptsdir = @networkscriptsdir@
+
+networkscripts_SCRIPTS = \
        ifdown-ppp \
        ifdown-sl \
-       ifup \
        ifup-aliases \
        ifup-ipx \
        ifup-plip \
        ifup-post \
        ifup-ppp \
        ifup-routes \
-       ifup-sl \
-       tnldown \
-       tnlup
-
-#lib_DATA = network-functions
-
+       ifup-sl 
 
 #SUBDIRS = data
 
@@ -29,3 +30,4 @@ interfaces_DATA =
 EXTRA_DIST = \
        $(interfaces_DATA) \
        $(sbin_SCRIPTS) \
+       $(networkscripts_SCRIPTS)