fifteen: rename /etc/modprobe.d config files.

[people/teissler/ipfire-2.x.git] / config / rootfiles / core / fifteen / update.sh

diff --git a/config/rootfiles/core/fifteen/update.sh b/config/rootfiles/core/fifteen/update.sh
index 2bbb5399c36123a0a60ed960f5f64a9966522856..12d6b1c0fb3d1f7170d72a8de312c6e7cc866142 100644 (file)
--- a/config/rootfiles/core/fifteen/update.sh
+++ b/config/rootfiles/core/fifteen/update.sh
@@ -71,7 +71,7 @@ esac
 
 #
 #
-KVER="3.10.25"
+KVER="3.10.26"
 MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 `
 # Nur den letzten Parameter verwenden
 echo $MOUNT > /dev/null
@@ -109,6 +109,7 @@ add_to_backup srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
 add_to_backup var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
 add_to_backup etc/inittab
 add_to_backup etc/fstab
+add_to_backup usr/share/usb_modeswitch
 
 # Backup the files
 tar cJvf /var/ipfire/backup/core-upgrade$core_$KVER.tar.xz \
@@ -137,6 +138,9 @@ rm -rf /boot/uImage-ipfire-*
 rm -rf /boot/uInit-ipfire-*
 rm -rf /lib/modules
 
+# Remove old usb_modeswitch_data
+rm -rf /usr/share/usb_modeswitch
+
 #
 # Remove old udev rules.
 #
@@ -170,6 +174,11 @@ esac
 # Remove the old default theme
 rm -rf /srv/web/ipfire/html/themes/ipfire
 
+# rename /etc/modprobe.d files
+for i in $(find /etc/modprobe.d/* | grep -v ".conf")
+       mv $i $i.conf
+done
+
 #
 #Extract files
 tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /