Updated kernel (2.6.32.23).

[ipfire-2.x.git] / config / rootfiles / core / test / update.sh

diff --git a/config/rootfiles/core/test/update.sh b/config/rootfiles/core/test/update.sh
index 1aae08e46387995ee508594f3f0a7f46306daeeb..1c24afed337ec8195b2a9b6e17d9e4d5a506753b 100644 (file)
--- a/config/rootfiles/core/test/update.sh
+++ b/config/rootfiles/core/test/update.sh
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 #
-KVER="2.6.32.21"
+KVER="2.6.32.23"
 MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
 echo $MOUNT > /dev/null
@@ -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
 #
@@ -98,7 +101,7 @@ SWAP=`grep "/dev/" /proc/swaps | cut -d" " -f1`
 #
 
 if [ ! -z $ROOT ]; then
-       ROOTUUID=`blkid -sUUID $ROOT | cut -d'"' -f2`
+       ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
        if [ ! -z $ROOTUUID ]; then
                sed -i "s|^$ROOT|UUID=$ROOTUUID|g" /etc/fstab
        #else
@@ -109,7 +112,7 @@ if [ ! -z $ROOT ]; then
 fi
 
 if [ ! -z $BOOT ]; then
-       BOOTUUID=`blkid -sUUID $BOOT | cut -d'"' -f2`
+       BOOTUUID=`blkid -c /dev/null -sUUID $BOOT | cut -d'"' -f2`
        if [ ! -z $BOOTUUID ]; then
                sed -i "s|^$BOOT|UUID=$BOOTUUID|g" /etc/fstab
        #else
@@ -120,7 +123,7 @@ if [ ! -z $BOOT ]; then
 fi
 
 if [ ! -z $VAR ]; then
-       VARUUID=`blkid -sUUID $VAR | cut -d'"' -f2`
+       VARUUID=`blkid -c /dev/null -sUUID $VAR | cut -d'"' -f2`
        if [ ! -z $VARUUID ]; then
                sed -i "s|^$VAR|UUID=$VARUUID|g" /etc/fstab
        #else
@@ -131,7 +134,7 @@ if [ ! -z $VAR ]; then
 fi
 
 if [ ! -z $SWAP ]; then
-       SWAPUUID=`blkid -sUUID $SWAP | cut -d'"' -f2`
+       SWAPUUID=`blkid -c /dev/null -sUUID $SWAP | cut -d'"' -f2`
        if [ ! -z $SWAPUUID ]; then
                sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab
        else
@@ -139,7 +142,7 @@ if [ ! -z $SWAP ]; then
                swapoff -a
                mkswap $SWAP
                swapon -a
-               SWAPUUID=`blkid -sUUID $SWAP | cut -d'"' -f2`
+               SWAPUUID=`blkid -c /dev/null -sUUID $SWAP | cut -d'"' -f2`
                if [ ! -z $SWAPUUID ]; then
                        sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab
                fi