]> git.pld-linux.org Git - projects/rc-scripts.git/commitdiff
projects / projects / rc-scripts.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7a5014d)
- /etc/rc.d/init.d//network.functions moved to
authorkloczek <kloczek@pld-linux.org>
Wed, 13 Oct 1999 21:28:40 +0000 (21:28 +0000)
committerkloczek <kloczek@pld-linux.org>
Wed, 13 Oct 1999 21:28:40 +0000 (21:28 +0000)
  /etc/sysconfig/network-scripts/.functions.

svn-id: @578

15 files changed:
rc-scripts.spec.in patch | blob | blame | history
rc.d/init.d/Makefile.am patch | blob | blame | history
sysconfig/network-scripts/ifdown patch | blob | blame | history
sysconfig/network-scripts/ifdown-post patch | blob | blame | history
sysconfig/network-scripts/ifdown-ppp patch | blob | blame | history
sysconfig/network-scripts/ifdown-sl patch | blob | blame | history
sysconfig/network-scripts/ifup patch | blob | blame | history
sysconfig/network-scripts/ifup-aliases patch | blob | blame | history
sysconfig/network-scripts/ifup-ipx patch | blob | blame | history
sysconfig/network-scripts/ifup-plip patch | blob | blame | history
sysconfig/network-scripts/ifup-post patch | blob | blame | history
sysconfig/network-scripts/ifup-ppp patch | blob | blame | history
sysconfig/network-scripts/ifup-sl patch | blob | blame | history
sysconfig/network-scripts/tnldown patch | blob | blame | history
sysconfig/network-scripts/tnlup patch | blob | blame | history

diff --git a/rc-scripts.spec.in b/rc-scripts.spec.in
index 35ecd24efa8bd0131de5746b672416d271497b6f..ff1ca0f9984d5c1b2a45b0fd628bc7bb21ce9841 100644 (file)
--- a/rc-scripts.spec.in
+++ b/rc-scripts.spec.in
@@ -1,4 +1,4 @@
-# $Id: rc-scripts.spec.in,v 1.32 1999/10/13 17:35:33 baggins Exp $
+# $Id: rc-scripts.spec.in,v 1.33 1999/10/13 21:28:40 kloczek Exp $
 Summary:       inittab and /etc/rc.d scripts
 Summary(de):   inittab und /etc/rc.d Scripts
 Summary(fr):   inittab et scripts /etc/rc.d
@@ -129,7 +129,7 @@ fi
 %attr(755,root,root) %dir %{_sysconfdir}/rc.d/rc?.d
 
 %{_sysconfdir}/rc.d/init.d/functions
-%{_sysconfdir}/rc.d/init.d/functions.network
+%{_sysconfdir}/sysconfig/network-scripts/.functions
 %attr(754,root,root) %{_sysconfdir}/rc.d/init.d/allowlogin
 %attr(754,root,root) %{_sysconfdir}/rc.d/init.d/killall
 %attr(754,root,root) %{_sysconfdir}/rc.d/init.d/random
diff --git a/rc.d/init.d/Makefile.am b/rc.d/init.d/Makefile.am
index dfb6845cefab80591c9f06251e7df7e59d661c35..83f17ff857d8e5f6a74f9890b32ded2391a364dd 100644 (file)
--- a/rc.d/init.d/Makefile.am
+++ b/rc.d/init.d/Makefile.am
@@ -9,8 +9,10 @@ init_SCRIPTS = \
        random \
        single \
        allowlogin
-
-init_DATA = functions functions.network
        
-EXTRA_DIST = $(init_SCRIPTS) $(init_DATA)      
+init_DATA = functions
+
+EXTRA_DIST = $(init_SCRIPTS) $(init_DATA) functions.network
 
+install-data-hook:
+       $(INSTALL) functions.network $(DESTDIR)/etc/sysconfig/network-scrpts/.functions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 8e8071b58033108ee310bbe70ea90c632af87971..3e66fae8376249fe19aa94a9bb73c6620c59f05b 100755 (executable)
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -1,13 +1,12 @@
 #!/bin/sh
 #
-#      $Id: ifdown,v 1.13 1999/10/06 16:52:37 kloczek Exp $
+#      $Id: ifdown,v 1.14 1999/10/13 21:28:40 kloczek Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
-cd /etc/sysconfig/network-scripts
 . /etc/sysconfig/network
 . /etc/rc.d/init.d/functions
-. /etc/rc.d/init.d/functions.network
+. /etc/sysconfig/network-scripts/.functions
 
 CONFIG=$1
 
diff --git a/sysconfig/network-scripts/ifdown-post b/sysconfig/network-scripts/ifdown-post
index 247a546e5ec3c078059e6f5f819c62bcf7917eb0..f1c67c55e1ecfbdd97a617789d311daab277a3eb 100755 (executable)
--- a/sysconfig/network-scripts/ifdown-post
+++ b/sysconfig/network-scripts/ifdown-post
@@ -1,16 +1,15 @@
 #!/bin/sh
 #
-#      $Id: ifdown-post,v 1.7 1999/09/28 16:17:30 jajcus Exp $
+#      $Id: ifdown-post,v 1.8 1999/10/13 21:28:40 kloczek Exp $
 #
 # This should be called whenever an interface goes down, not just when
 # it is brought down explicitly.
 
-cd /etc/sysconfig/network-scripts
-
 CONFIG=$1
 . /etc/sysconfig/network
 . /etc/rc.d/init.d/functions
-. /etc/rc.d/init.d/functions.network
+. /etc/sysconfig/network-scripts/.functions
+
 source_config
 
 # Notify programs that have requested notification
diff --git a/sysconfig/network-scripts/ifdown-ppp b/sysconfig/network-scripts/ifdown-ppp
index 0c86aa90e32866c7252d036956106b3a2ee504f4..4967ef10cdcd73f954c3a09136c3f57976ec47b7 100755 (executable)
--- a/sysconfig/network-scripts/ifdown-ppp
+++ b/sysconfig/network-scripts/ifdown-ppp
@@ -1,13 +1,12 @@
 #!/bin/sh
 #
-#      $Id: ifdown-ppp,v 1.7 1999/09/28 16:17:30 jajcus Exp $
+#      $Id: ifdown-ppp,v 1.8 1999/10/13 21:28:40 kloczek Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
-cd /etc/sysconfig/network-scripts
 . /etc/sysconfig/network
 . /etc/rc.d/init.d/functions
-. /etc/rc.d/init.d/functions.network
+. /etc/sysconfig/network-scripts/.functions
 
 CONFIG=$1
 source_config
diff --git a/sysconfig/network-scripts/ifdown-sl b/sysconfig/network-scripts/ifdown-sl
index 0628dfcbe35083e852a8e3b17dc99d0d6ff465f7..0ed23eb12e65ffddf75e81057385b9d2467ecc1c 100755 (executable)
--- a/sysconfig/network-scripts/ifdown-sl
+++ b/sysconfig/network-scripts/ifdown-sl
@@ -1,13 +1,12 @@
 #!/bin/sh
 #
-#      $Id: ifdown-sl,v 1.8 1999/10/06 16:52:37 kloczek Exp $
+#      $Id: ifdown-sl,v 1.9 1999/10/13 21:28:40 kloczek Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
-cd /etc/sysconfig/network-scripts
 . /etc/sysconfig/network
 . /etc/rc.d/init.d/functions
-. /etc/rc.d/init.d/functions.network
+. /etc/sysconfig/network-scripts/.functions
 
 CONFIG=$1
 source_config
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 4f2b52650946aa9e2050ca9ad2e55eb2e5f18c0a..0a42359092193a4529c62b4fd4a5c7500d4a49ec 100755 (executable)
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -1,13 +1,12 @@
 #!/bin/sh
 #
-#      $Id: ifup,v 1.28 1999/10/06 16:52:37 kloczek Exp $
+#      $Id: ifup,v 1.29 1999/10/13 21:28:40 kloczek Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
-cd /etc/sysconfig/network-scripts
 . /etc/sysconfig/network
 . /etc/rc.d/init.d/functions
-. /etc/rc.d/init.d/functions.network
+. /etc/sysconfig/network-scripts/.functions
 
 need_hostname
 
diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases
index 4ab164b70982d11419a80a208dfc46c7709174da..8aaf3ba07e6d500cb4f8d68fb9745720d263edff 100755 (executable)
--- a/sysconfig/network-scripts/ifup-aliases
+++ b/sysconfig/network-scripts/ifup-aliases
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-#      $Id: ifup-aliases,v 1.8 1999/09/28 16:17:30 jajcus Exp $
+#      $Id: ifup-aliases,v 1.9 1999/10/13 21:28:40 kloczek Exp $
 #
 # adds aliases of device $1
 
 . /etc/sysconfig/network
-. /etc/rc.d/init.d/functions.network
+. /etc/sysconfig/network-scripts/.functions
 
 if [ "$1" = "" ]; then
        echo "usage: $0 <net-device>"
diff --git a/sysconfig/network-scripts/ifup-ipx b/sysconfig/network-scripts/ifup-ipx
index c6688c2716578f2a1110326a2420b00fda11d784..a135941229bf2f0cde9b51d2b84692b7c99253ed 100755 (executable)
--- a/sysconfig/network-scripts/ifup-ipx
+++ b/sysconfig/network-scripts/ifup-ipx
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ifup-ipx,v 1.6 1999/09/28 16:17:30 jajcus Exp $
+#      $Id: ifup-ipx,v 1.7 1999/10/13 21:28:40 kloczek Exp $
 #
 # configures IPX on $1 if appropriate
 
@@ -22,7 +22,7 @@ case $IPX in yes|true) ;; *) exit 0 ;; esac
 
 cd /etc/sysconfig/network-scripts
 . /etc/rc.d/init.d/functions
-. /etc/rc.d/init.d/functions.network
+. /etc/sysconfig/network-scripts/.functions
 
 CONFIG=$1
 [ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
diff --git a/sysconfig/network-scripts/ifup-plip b/sysconfig/network-scripts/ifup-plip
index a3d717a0d1e0e009a05686a93b7b0c08c5fede29..7ffe64bb62eaa0b479410912b0e27282220fa6df 100755 (executable)
--- a/sysconfig/network-scripts/ifup-plip
+++ b/sysconfig/network-scripts/ifup-plip
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-#      $Id: ifup-plip,v 1.8 1999/07/31 11:24:20 misiek Exp $
+#      $Id: ifup-plip,v 1.9 1999/10/13 21:28:40 kloczek Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 cd /etc/sysconfig/network-scripts
-. /etc/rc.d/init.d/functions.network
+. /etc/sysconfig/network-scripts/.functions
 
 CONFIG=$1
 source_config
diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post
index 7a0bf4e05d13bd74b0327ae975927fad5afe438a..2cb41de8214cbfefc59da0c17e84fade6c61973d 100755 (executable)
--- a/sysconfig/network-scripts/ifup-post
+++ b/sysconfig/network-scripts/ifup-post
@@ -1,11 +1,10 @@
 #!/bin/sh
 #
-#      $Id: ifup-post,v 1.12 1999/10/06 16:52:37 kloczek Exp $
+#      $Id: ifup-post,v 1.13 1999/10/13 21:28:40 kloczek Exp $
 #
 
-cd /etc/sysconfig/network-scripts
 . /etc/sysconfig/network
-. /etc/rc.d/init.d/functions.network
+. /etc/sysconfig/network-scripts/.functions
 
 need_hostname
 CONFIG=$1
diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index d2ddeff227af97047a3d3baa370f80e13ed9cccc..9e852aa27408ab20a885475a9b7706836a248c28 100755 (executable)
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ifup-ppp,v 1.7 1999/09/28 16:17:30 jajcus Exp $
+#      $Id: ifup-ppp,v 1.8 1999/10/13 21:28:40 kloczek Exp $
 #
 # ifup-ppp script for pppd-2.3.5 (with persist & demand options) ver 0.2
 # Grzegorz Stanislawski <stangrze@open.net.pl>
@@ -27,10 +27,10 @@ fi
 shift
 
 CONFIG=$1
-cd /etc/sysconfig/network-scripts
 . /etc/sysconfig/network
 . /etc/rc.d/init.d/functions
-. /etc/rc.d/init.d/functions.network
+. /etc/sysconfig/network-scripts/.functions
+
 source_config
 if [ -z "$HOLDOFF" ]; then
   HOLDOFF=30
diff --git a/sysconfig/network-scripts/ifup-sl b/sysconfig/network-scripts/ifup-sl
index f10568d0930d30830830f974377f7c3d254a53d8..eb1c9bca7a734aa1051c09d2a3c33f37d7507c84 100755 (executable)
--- a/sysconfig/network-scripts/ifup-sl
+++ b/sysconfig/network-scripts/ifup-sl
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $Id: ifup-sl,v 1.14 1999/10/06 16:52:37 kloczek Exp $
+#      $Id: ifup-sl,v 1.15 1999/10/13 21:28:40 kloczek Exp $
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
@@ -15,9 +15,8 @@ if [ "$1" != daemon ] ; then
 fi
 shift
 
-cd /etc/sysconfig/network-scripts
 . /etc/rc.d/init.d/functions
-. /etc/rc.d/init.d/functions.network
+. /etc/sysconfig/network-scripts/.functions
 
 CONFIG=$1
 source_config
diff --git a/sysconfig/network-scripts/tnldown b/sysconfig/network-scripts/tnldown
index 9fff16f57db570029f5f7f1c959a7970a204a46c..57ccb5f9be45d9725ebb9ff2d9c14ca3943039d2 100755 (executable)
--- a/sysconfig/network-scripts/tnldown
+++ b/sysconfig/network-scripts/tnldown
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-#      $Id: tnldown,v 1.8 1999/10/06 16:52:37 kloczek Exp $
+#      $Id: tnldown,v 1.9 1999/10/13 21:28:40 kloczek Exp $
 #
 # Author: Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
 #
 
 cd /etc/sysconfig/network-scripts
-. /etc/rc.d/init.d/functions.network
+. /etc/sysconfig/network-scripts/.functions
 . /etc/sysconfig/network
 
 CONFIG=$1
diff --git a/sysconfig/network-scripts/tnlup b/sysconfig/network-scripts/tnlup
index 6b7bcdda2dcad988878388aee250928cf6a50655..bf445b7a1a2b48bad29056d4872b6d25c18e9c71 100755 (executable)
--- a/sysconfig/network-scripts/tnlup
+++ b/sysconfig/network-scripts/tnlup
@@ -1,12 +1,11 @@
 #!/bin/sh
 #
-#      $Id: tnlup,v 1.12 1999/10/06 16:52:37 kloczek Exp $
+#      $Id: tnlup,v 1.13 1999/10/13 21:28:40 kloczek Exp $
 #
 # Author: Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
 #
 
-cd /etc/sysconfig/network-scripts
-. /etc/rc.d/init.d/functions.network
+. /etc/sysconfig/network-scripts/.functions
 . /etc/sysconfig/network
 
 CONFIG=$1
inittab and /etc/rc.d scripts
This page took 0.052901 seconds and 4 git commands to generate.