From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 10 Aug 2009 09:16:50 +0000 (+0200)
Subject: Fix network assignment on ct'server image
X-Git-Tag: v2.5-core30~37
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=9fce1941898f879db1bb9b7635cc1465e8229a66

Fix network assignment on ct'server image
Change pakfire trunk of ct'server to 2.5-ct
---

diff --git a/config/rootfiles/core/30/update.sh b/config/rootfiles/core/30/update.sh
index f267862b97..217ee96d8c 100644
--- a/config/rootfiles/core/30/update.sh
+++ b/config/rootfiles/core/30/update.sh
@@ -28,3 +28,22 @@ extract_files
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 #Rebuild module dep's
 depmod -a
+#
+# Test if this is a ct'server
+#
+ctdisk=`ls -l /dev/disk/by-uuid/0bd2211e-4268-442d-9f42-9fb1f8234a7e 2>/dev/null | cut -d">" -f2`
+if [ "$ctdisk" == " ../../xvda3" ]; then
+	echo "This is a ct-server..."
+	#
+	# Fix network assignment because 30-persistent-network.rules are overwritten by setup
+	# (eg. If you try to configure red=dhcp)
+	#
+	echo 'KERNEL=="eth0", NAME=="green0"'  >  /etc/udev/rules.d/29-ct-server-network.rules
+	echo 'KERNEL=="eth1", NAME=="red0"'    >> /etc/udev/rules.d/29-ct-server-network.rules
+	echo 'KERNEL=="eth2", NAME=="blue0"'   >> /etc/udev/rules.d/29-ct-server-network.rules
+	echo 'KERNEL=="eth3", NAME=="orange0"' >> /etc/udev/rules.d/29-ct-server-network.rules
+	#
+	# Change pakfire trunk from 2.5 to 2.5-ct
+	#
+	sed -i 's|"2.5"|"2.5-ct"|g' /opt/pakfire/etc/pakfire.conf
+fi