Benjamin Schieder:

package/base/sysfiles/network.init → package/base/rocknet/network.init

@@ -29,6 +29,13 @@
 main_begin
 
     block_begin(start, `Setting up network devices.')
+    	block_split(`Renaming network interfaces')
+    		if [ -e /etc/iftab ] ; then
+			check(`ifrename')
+		else
+			true
+		fi
+
 	oldprof="$(cat /etc/network/profile 2>/dev/null)"
 	oldprof=${oldprof:-default}
 	if [ -n "$2" ]; then

package/base/rocknet/rocknet.conf

@@ -0,0 +1,60 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/base/sysfiles/sysfiles.conf
+# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+main_rn() {
+	cd $root/
+
+	echo "Creating various etc/* files ..."
+	for x in $( cd $confdir ; echo etc_*.txt ) ; do
+		y="${x%.txt}" ; z="/"
+		if [ -f "${y//_/$z}" ]
+		then
+			echo "Found old ${y//_/$z} (don't overwrite)."
+			touch "${y//_/$z}"
+		else
+			cp -v "$confdir/$x" "${y//_/$z}"
+		fi
+	done
+	[ -f etc/HOSTNAME ] || echo localhost > etc/HOSTNAME
+
+	echo "Installing the rock-net tool ..."
+	cp -v $confdir/rocknet.sh etc/network/rocknet
+	if [ ! -f etc/network/config ]; then
+		cp -vf $confdir/rocknet_config etc/network/config
+	fi
+	chmod +x etc/network/rocknet
+	for x in $( cd $confdir; echo rocknet_{*.sh,README,getprofile}; ); do
+		dst="${x#rocknet_}"; z="/"; dst="${dst//_/$z}"
+		cp -vf $confdir/$x etc/network/$dst
+	done
+	cp -vf $confdir/ifup.sh sbin/ifup
+	chmod +x etc/network/getprofile sbin/ifup
+	ln -sf ifup sbin/ifdown
+
+	echo "Installing 'network' init script ..."
+	install_init network $confdir/network.init
+}
+
+custmain="main_rn"
+autoextract=0
+check_usrlocal=0
+

package/base/rocknet/rocknet.desc

@@ -0,0 +1,39 @@
+
+[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+[COPY] 
+[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+[COPY] Please add additional copyright information _after_ the line containing
+[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+[COPY] 
+[COPY] ROCK Linux: rock-src/package/base/rocknet/rocknet.desc
+[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+[COPY] 
+[COPY] This program is free software; you can redistribute it and/or modify
+[COPY] it under the terms of the GNU General Public License as published by
+[COPY] the Free Software Foundation; either version 2 of the License, or
+[COPY] (at your option) any later version. A copy of the GNU General Public
+[COPY] License can be found at Documentation/COPYING.
+[COPY] 
+[COPY] Many people helped and are helping developing ROCK Linux. Please
+[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+[COPY] file for details.
+[COPY] 
+[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
+
+[I] ROCK Network system
+
+[T] This package contains the ROCK Net network configuration system
+
+[A] Clifford Wolf <clifford@clifford.at>
+[M] The ROCK Linux Project
+
+[C] base/system
+
+[L] GPL
+[S] Stable
+[V] 0000 0
+[P] X -1-3---7-9 204.200
+
+[CV-URL] none
+

package/base/sysfiles/sysfiles.conf

@@ -35,7 +35,6 @@ main_sf() {
 			cp -v "$confdir/$x" "${y//_/$z}"
 		fi
 	done
-	[ -f etc/HOSTNAME ] || echo localhost > etc/HOSTNAME
 	chmod +x etc/initscript etc/rc.d/rc
 
 	echo "Add missing entries to etc/services .."
@@ -64,20 +63,6 @@ EOT
 		cp -v $confdir/$x etc/stone.d/${x#stone_}
 	done
 
-	echo "Installing the rock-net tool ..."
-	cp -v $confdir/rocknet.sh etc/network/rocknet
-	if [ ! -f etc/network/config ]; then
-		cp -vf $confdir/rocknet_config etc/network/config
-	fi
-	chmod +x etc/network/rocknet
-	for x in $( cd $confdir; echo rocknet_{*.sh,README,getprofile}; ); do
-		dst="${x#rocknet_}"; z="/"; dst="${dst//_/$z}"
-		cp -vf $confdir/$x etc/network/$dst
-	done
-	cp -vf $confdir/ifup.sh sbin/ifup
-	chmod +x etc/network/getprofile sbin/ifup
-	ln -sf ifup sbin/ifdown
-
 	echo "Create /etc/issue, /etc/issue.ansi and /etc/issue.net ... "
 	rocktxt="ROCK Linux $rockver $arch"
 	. $confdir/issue-std.sh
@@ -128,9 +113,6 @@ EOT
 	echo "Installing 'system' init script ..."
 	install_init system $confdir/system.init
 
-	echo "Installing 'network' init script ..."
-	install_init network $confdir/network.init
-
 	echo "Exporting LINGUAS environment variable ..."
 	if [ "$ROCKCFG_LINGUAS" == "all" ] ; then
 		echo "# export LINGUAS=" > $root/etc/profile.d/linguas

package/base/sysfiles/system.init

@@ -157,12 +157,6 @@ dnl
 		check(`cat /var/state/random-seed >/dev/urandom')
 	fi
 
-    block_split(`Renaming network interfaces')
-    	if [ -e /etc/iftab ] ; then
-		check(`ifrename')
-	fi
-    block_end
-
     block_begin(stop, `Saving /var/log/init.msg and /var/log/boot.msg.')
 	check(`echo -n >> /var/log/init.msg')
 	check(`echo -n >> /var/log/boot.msg')