Cleanup: Removed unused realtek driver lfs-files

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

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 1e68f0badcc1d7584947e7a5086d847430a3b778..b6a6114ccf9d7f49f9d0aaec787e4c5d48d0bc19 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -26,7 +26,7 @@
 #
 OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
 NEWVERSION="2.3"
-KVER="2.6.23.17"
+KVER="2.6.25.19"
 ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
 MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
@@ -63,6 +63,14 @@ echo srv/web/ipfire/cgi-bin/traffics.cgi >> /opt/pakfire/tmp/ROOTFILES
 echo srv/web/ipfire/cgi-bin/graphs.cgi >> /opt/pakfire/tmp/ROOTFILES
 echo srv/web/ipfire/cgi-bin/qosgraph.cgi >> /opt/pakfire/tmp/ROOTFILES
 #
+
+# Remove some files from the rootfiles
+cat /opt/pakfire/tmp/ROOTFILES \
+       | grep -v "var/log/cache" \
+       | grep -v "var/updatecache" > /opt/pakfire/tmp/ROOTFILESNEW
+
+mv -f /opt/pakfire/tmp/ROOTFILESNEW /opt/pakfire/tmp/ROOTFILES
+
 tar czvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.gz \
    -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1 
 echo
@@ -161,10 +169,10 @@ grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
 # Update fstab
 #
 grep -v "tmpfs" /etc/fstab > /tmp/fstab.tmp
-echo "none     /tmp            tmpfs   defaults,size=128M      0       0" >> /tmp/fstab.tmp
-echo "none     /var/log/rrd    tmpfs   defaults,size=64M       0       0" >> /tmp/fstab.tmp
-echo "none     /var/lock       tmpfs   defaults,size=16M       0       0" >> /tmp/fstab.tmp
-echo "none     /var/run        tmpfs   defaults,size=16M       0       0" >> /tmp/fstab.tmp
+echo "#none    /tmp            tmpfs   defaults        0       0" >> /tmp/fstab.tmp
+echo "none     /var/log/rrd    tmpfs   defaults,size=112M      0       0" >> /tmp/fstab.tmp
+echo "none     /var/lock       tmpfs   defaults,size=8M        0       0" >> /tmp/fstab.tmp
+echo "none     /var/run        tmpfs   defaults,size=8M        0       0" >> /tmp/fstab.tmp
 mv /tmp/fstab.tmp /etc/fstab
 #
 # Change version of Pakfire.conf
@@ -196,11 +204,16 @@ sed -i 's|"net", SYSFS{address}|"net", SYSFS{type}=="1", SYSFS{address}|g' \
 # Move vnstat database to /var/log/rrd
 #
 mkdir -p /var/log/rrd.bak/vnstat
+mkdir -p /var/log/rrd/vnstat
 if [ -e /var/log/vnstat ]; then
     cp -pR /var/log/vnstat /var/log/rrd.bak/vnstat
     mv /var/log/vnstat /var/log/rrd/vnstat
 fi
 #
+# Fix qos.sh 
+#
+sed -i 's|rmmod imq|#rmmod imq|g' /var/ipfire/qos/bin/qos.sh
+#
 # Core 17
 #
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
@@ -229,10 +242,18 @@ echo '/opt/pakfire/pakfire update -y --force'             >> /tmp/remove_obsolet
 echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/remove_obsolete_paks
 echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/remove_obsolete_paks
 echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/remove_obsolete_paks
-echo 'logger -p syslog.emerg -t core-upgrade-19 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
+echo 'logger -p syslog.emerg -t core-upgrade-23 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
 #
 chmod +x /tmp/remove_obsolete_paks
 /tmp/remove_obsolete_paks &
 echo
 echo Please wait until pakfire has ended...
 echo
+
+echo
+echo Finaly were going to renew all ssh keys
+echo
+
+rm -f /etc/ssh/ssh_host_rsa_key* && ssh-keygen -qf /etc/ssh/ssh_host_rsa_key -N ''
+rm -f /etc/ssh/ssh_host_key* && ssh-keygen -qf /etc/ssh/ssh_host_key -N '' -t rsa1
+rm -f /etc/ssh/ssh_host_dsa_key* && ssh-keygen -qf /etc/ssh/ssh_host_dsa_key -N '' -t dsa