From ae283dc2afdc585df2cc667773370d8c2d4e8443 Mon Sep 17 00:00:00 2001
From: Stefan Fiedler <stefan.fiedler@students.jku.at>
Date: Fri, 11 May 2007 18:51:43 +0000
Subject: [PATCH] Stefan Fiedler: 	etcnet: fix init script installation
 for good

[2007020414114526586] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8363 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/pilot/etcnet/etcnet.conf  |  1 +
 package/pilot/etcnet/hotfix.patch | 15 ------------
 package/pilot/etcnet/network.init | 40 +++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 15 deletions(-)
 create mode 100644 package/pilot/etcnet/network.init

diff --git a/package/pilot/etcnet/etcnet.conf b/package/pilot/etcnet/etcnet.conf
index d0659cd2e..067416b88 100644
--- a/package/pilot/etcnet/etcnet.conf
+++ b/package/pilot/etcnet/etcnet.conf
@@ -4,6 +4,7 @@ var_append makeinstopt " " "-f contrib/Makefile"
 
 etcnet_postmake() {
 	install -m 644 contrib/50-RockLinux-3 $root/etc/net/options.d/
+	install_init network $confdir/network.init
 }
 
 hook_add postmake 5 etcnet_postmake
diff --git a/package/pilot/etcnet/hotfix.patch b/package/pilot/etcnet/hotfix.patch
index b1c6dd518..2a31667d7 100644
--- a/package/pilot/etcnet/hotfix.patch
+++ b/package/pilot/etcnet/hotfix.patch
@@ -7,18 +7,3 @@ diff -pruN etcnet-0.8.5/contrib/50-RockLinux-3 etcnet-0.8.5-new/contrib/50-RockL
  # Temp hack
 -IFRENAME=/usr/sbin/ifrename
 +IFRENAME=/sbin/ifrename
-diff -pruN etcnet-0.8.5/etc/net/scripts/network.init etcnet-0.8.5-new/etc/net/scripts/network.init
---- etcnet-0.8.5/etc/net/scripts/network.init	2006-09-08 21:29:00.000000000 +0200
-+++ etcnet-0.8.5-new/etc/net/scripts/network.init	2006-10-28 12:43:14.000000000 +0200
-@@ -1,8 +1,8 @@
- #!/bin/bash
- #
--# network
--# chkconfig: 2345 10 90
--# description: /etc/net is network configuration software
-+# Desc: Network configuration using etc/net
-+# Runlevel: 15 rcX rc3 rc4 rc5
-+#
- 
- # ALTLinux: Do not load RH compatibility interface.
- WITHOUT_RC_COMPAT=1
diff --git a/package/pilot/etcnet/network.init b/package/pilot/etcnet/network.init
new file mode 100644
index 000000000..5491071a5
--- /dev/null
+++ b/package/pilot/etcnet/network.init
@@ -0,0 +1,40 @@
+#!/bin/bash
+#
+# Desc: Network configuration using etc/net
+# Runlevel: 15 rcX rc3 rc4 rc5
+#
+
+SCRIPTDIR=/etc/net/scripts
+
+main_begin
+	block_begin(start, `Starting etcnet networking.')
+		$SCRIPTDIR/network.init $*
+	block_end
+	block_begin(startwith, `Starting etcnet networking with $2.')
+		$SCRIPTDIR/network.init $*
+	block_end
+	block_begin(stop, `Stopping etcnet networking.')
+		$SCRIPTDIR/network.init $*
+	block_end
+	block_begin(stopwith, `Stopping etcnet networking with $2.')
+		$SCRIPTDIR/network.init $*
+	block_end
+	block_begin(restart, `Restarting etcnet networking.')
+		$SCRIPTDIR/network.init $*
+	block_end
+	block_begin(reload, `Reloading etcnet networking.')
+		$SCRIPTDIR/network.init $*
+	block_end
+	block_begin(restartwith, `Restarting etcnet networking with $2.')
+		$SCRIPTDIR/network.init $*
+	block_end
+	block_begin(switchto, `Switching etcnet networking to $2.')
+		$SCRIPTDIR/network.init $*
+	block_end
+	block_begin(switchfrom, `Switching etcnet networking from $2.')
+		$SCRIPTDIR/network.init $*
+	block_end
+	block_begin("c""heck", `Checking etcnet networking.')
+		$SCRIPTDIR/network.init $*
+	block_end
+main_end