X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Frootfiles%2Fcore%2Ftest%2Fupdate.sh;h=0bf88299a93ace407430a8c10d4d1911faca1533;hp=a531e912a27c02a592cd989d311625ab9b608a72;hb=4a2a1232c7deba53bb48c6df69d95631dc19b95e;hpb=6a0328658a0a3ca9b9bcdb95aedc427ebd5196ae

diff --git a/config/rootfiles/core/test/update.sh b/config/rootfiles/core/test/update.sh
index a531e912a2..0bf88299a9 100644
--- a/config/rootfiles/core/test/update.sh
+++ b/config/rootfiles/core/test/update.sh
@@ -51,6 +51,7 @@ echo etc/mkinitcpio.conf.org >> /opt/pakfire/tmp/ROOTFILES
 echo etc/mkinitcpio.d >> /opt/pakfire/tmp/ROOTFILES
 echo lib/initcpio >> /opt/pakfire/tmp/ROOTFILES
 echo sbin/mkinitcpio >> /opt/pakfire/tmp/ROOTFILES
+echo usr/bin/iw >> /opt/pakfire/tmp/ROOTFILES
 
 # Backup the files
 tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
@@ -69,6 +70,8 @@ rm -rf /lib/modules/*-ipfire
 rm -rf /etc/mkinitcpio.*
 rm -rf /lib/initcpio
 rm -rf /sbin/mkinitcpio
+# Remove old iw (new is in usr/sbin)
+rm -rf /usr/bin/iw
 #
 # Backup grub.conf
 #
@@ -82,6 +85,12 @@ echo Unpack the updated files ...
 tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
 	--no-overwrite-dir
 
+#
+# Stop services to save memory
+#
+/etc/init.d/snort stop
+/etc/init.d/squid stop
+
 # Convert /etc/fstab entries to UUID ...
 #
 echo Convert fstab entries to UUID ...
@@ -128,19 +137,36 @@ if [ ! -z $SWAP ]; then
 	SWAPUUID=`blkid -sUUID $SWAP | cut -d'"' -f2`
 	if [ ! -z $SWAPUUID ]; then
 		sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab
-	#else
-		#to do add uuid to swap
+	else
+		# Reformat swap to add a UUID
+		swapoff -a
+		mkswap $SWAP
+		swapon -a
+		SWAPUUID=`blkid -sUUID $SWAP | cut -d'"' -f2`
+		if [ ! -z $SWAPUUID ]; then
+			sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab
+		fi
 	fi
 	else
 	echo "WARNING! swap not found!!!"
 fi
 
+#
+# Start services
+#
+/etc/init.d/squid start
+/etc/init.d/snort start
+
 #
 # Modify grub.conf
 #
 echo
 echo Update grub configuration ...
-sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf
+if [ ! -z $ROOTUUID ]; then
+	sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf
+else
+	sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf
+fi
 sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf
 sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf
 
@@ -154,13 +180,20 @@ else
 	sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf
 fi
 #
+# Change /dev/hd? to /dev/sda
+#
+if [ "${ROOT:0:7}" == "/dev/hd" ];then
+	sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /boot/grub/grub.conf
+	sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /etc/fstab
+fi
+#
 # ReInstall grub
 #
 grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
 #
 # Rebuild Language
 #
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 #
 # Delete old lm-sensor modullist to force search at next boot
 #