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 a31f7d349470d3f1a0959395cfa1914ef348eeca..12d6b1c0fb3d1f7170d72a8de312c6e7cc866142 100644 (file)
--- a/config/rootfiles/core/fifteen/update.sh
+++ b/config/rootfiles/core/fifteen/update.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2013 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2014 IPFire-Team <info@ipfire.org>.                        #
 #                                                                          #
 ############################################################################
 #
@@ -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
@@ -107,6 +107,9 @@ add_to_backup usr/local/bin/setxtaccess
 add_to_backup usr/local/bin/outgoingfwctrl
 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 \
@@ -135,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.
 #
@@ -168,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 /
@@ -238,6 +249,15 @@ rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
 # Remove old firewall configuration files
 rm -rf /var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
 
+# Convert inittab and fstab
+sed -i -e "s/tty1 9600$/tty1 9600 --noclear/g" /etc/inittab
+sed -i -e "s/^proc/#proc/g" /etc/fstab
+sed -i -e "s/^sysfs/#sysfs/g" /etc/fstab
+sed -i -e "s/^devpts/#devpts/g" /etc/fstab
+
+# Convert udev persistent network rules
+sed -i -e "s/SYSFS{/ATTR{/g" /etc/udev/rules.d/30-persistent-network.rules
+
 #
 # Start services
 #
@@ -312,16 +332,16 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
                        "core-update-$core: WARNING not enough space for pae kernel."
        else
                echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
-               echo "ProgVersion: 3.10.24" >> /opt/pakfire/db/installed/meta-linux-pae
-               echo "Release: 30"     >> /opt/pakfire/db/installed/meta-linux-pae
+               echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+               echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
        fi
 fi
 
 # Force reinstall xen kernel if it was installed
 if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then
        echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen
-       echo "ProgVersion: 2.6.32.60" >> /opt/pakfire/db/installed/meta-linux-xen
-       echo "Release: 24"     >> /opt/pakfire/db/installed/meta-linux-xen
+       echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen
+       echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-xen
        # Add xvc0 to /etc/securetty
        echo "xvc0" >> /etc/securetty
 fi