Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

config/rootfiles/cdrom_corever

@@ -1 +1,2 @@
-15
+16
+

config/rootfiles/common/initscripts

@@ -9,6 +9,7 @@ etc/rc.d/init.d/apache
 #etc/rc.d/init.d/applejuice
 etc/rc.d/init.d/beep
 etc/rc.d/init.d/checkfs
+etc/rc.d/init.d/checkfstab
 #etc/rc.d/init.d/clamav
 etc/rc.d/init.d/cleanfs
 etc/rc.d/init.d/connectd
@@ -123,6 +124,7 @@ etc/rc.d/rc6.d/S99reboot
 etc/rc.d/rcsysinit.d/S00mountkernfs
 etc/rc.d/rcsysinit.d/S05modules
 etc/rc.d/rcsysinit.d/S10udev
+etc/rc.d/rcsysinit.d/S19checkfstab
 etc/rc.d/rcsysinit.d/S20swap
 etc/rc.d/rcsysinit.d/S30checkfs
 etc/rc.d/rcsysinit.d/S40mountfs

config/rootfiles/common/wireless

@@ -1,7 +1,7 @@
 #usr/include/iwlib.h
 #usr/include/wireless.h
-usr/lib/libiw.so
-usr/lib/libiw.so.28
+#usr/lib/libiw.so
+#usr/lib/libiw.so.28
 #usr/man/man5/iftab.5
 #usr/man/man7/wireless.7
 #usr/man/man8/ifrename.8

config/rootfiles/core/15/files

@@ -0,0 +1 @@
+usr/sbin/dnsmasq

config/rootfiles/updater/filelists/core16

@@ -20,3 +20,5 @@ bin/ntfs-3g
 lib/libntfs-3g.so
 lib/libntfs-3g.so.31
 lib/libntfs-3g.so.31.0.0
+etc/rc.d/init.d/checkfstab
+etc/rc.d/rcsysinit.d/S19checkfstab

config/rootfiles/updater/filelists/dnsmasq

@@ -0,0 +1,2 @@
+usr/sbin/dnsmasq
+#usr/share/man/man8/dnsmasq.8

config/rootfiles/updater/filelists/hwdata

@@ -0,0 +1,2 @@
+usr/share/hwdata/usb.ids
+usr/share/hwdata/pci.ids

config/rootfiles/updater/filelists/setup

@@ -0,0 +1,2 @@
+usr/local/sbin/setup
+bin/probenic.sh

config/rootfiles/updater/filelists/udev

@@ -1,73 +0,0 @@
-etc/scsi_id.config
-etc/modprobe.d/blacklist
-etc/udev
-#etc/udev/rules.d
-#etc/udev/rules.d/05-udev-early.rules
-#etc/udev/rules.d/25-lfs.rules
-#etc/udev/rules.d/26-modprobe.rules
-#etc/udev/rules.d/27-firmware.rules
-#etc/udev/rules.d/60-persistent-storage.rules
-#etc/udev/rules.d/81-cdrom.rules
-#etc/udev/udev.conf
-lib/firmware
-lib/libvolume_id.so.0
-lib/libvolume_id.so.0.66.0
-lib/udev
-#lib/udev/ata_id
-#lib/udev/cdrom_id
-#lib/udev/create_floppy_devices
-#lib/udev/devices
-#lib/udev/devices/core
-#lib/udev/devices/fd
-#lib/udev/devices/null
-#lib/udev/devices/pts
-#lib/udev/devices/shm
-#lib/udev/devices/stderr
-#lib/udev/devices/stdin
-#lib/udev/devices/stdout
-#lib/udev/edd_id
-#lib/udev/firmware.sh
-#lib/udev/path_id
-#lib/udev/scsi_id
-#lib/udev/usb_id
-#lib/udev/vol_id
-sbin/scsi_id
-sbin/udevcontrol
-sbin/udevd
-sbin/udevsettle
-sbin/udevtrigger
-usr/bin/udevinfo
-usr/bin/udevtest
-#usr/include/libvolume_id.h
-#usr/lib/libvolume_id.a
-usr/lib/libvolume_id.so
-#usr/lib/pkgconfig/libvolume_id.pc
-usr/sbin/udevmonitor
-#usr/share/doc/udev-096
-#usr/share/doc/udev-096/index.html
-#usr/share/man/man7/udev.7
-#usr/share/man/man8/ata_id.8
-#usr/share/man/man8/cdrom_id.8
-#usr/share/man/man8/edd_id.8
-#usr/share/man/man8/scsi_id.8
-#usr/share/man/man8/udevcontrol.8
-#usr/share/man/man8/udevd.8
-#usr/share/man/man8/udevinfo.8
-#usr/share/man/man8/udevmonitor.8
-#usr/share/man/man8/udevsettle.8
-#usr/share/man/man8/udevtest.8
-#usr/share/man/man8/udevtrigger.8
-#usr/share/man/man8/vol_id.8
-lib/initcpio/hooks/udev
-lib/initcpio/install/udev
-#lib/initcpio/udev
-lib/initcpio/udev/cdrom_id
-lib/initcpio/udev/firmware.sh
-lib/initcpio/udev/load-modules.sh
-lib/initcpio/udev/start_udev
-lib/initcpio/udev/udev.rules
-lib/initcpio/udev/udevd
-lib/initcpio/udev/udevsettle
-lib/initcpio/udev/udevtrigger
-etc/udev/dvb.sh
-etc/udev/rules.d/10-dvb.rules

config/rootfiles/updater/filelists/wireless

@@ -0,0 +1,20 @@
+#usr/include/iwlib.h
+#usr/include/wireless.h
+#usr/lib/libiw.so
+#usr/lib/libiw.so.28
+#usr/man/man5/iftab.5
+#usr/man/man7/wireless.7
+#usr/man/man8/ifrename.8
+#usr/man/man8/iwconfig.8
+#usr/man/man8/iwevent.8
+#usr/man/man8/iwgetid.8
+#usr/man/man8/iwlist.8
+#usr/man/man8/iwpriv.8
+#usr/man/man8/iwspy.8
+usr/sbin/ifrename
+usr/sbin/iwconfig
+usr/sbin/iwevent
+usr/sbin/iwgetid
+usr/sbin/iwlist
+usr/sbin/iwpriv
+usr/sbin/iwspy

config/rootfiles/updater/update.sh

@@ -40,9 +40,9 @@ echo
 #
 # check if we the backup file already exist
 if [ -e /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 ]; then
-    echo Error! The backupfile of this update already exist!!!
-    echo Have you already installed this update?
-    exit 3
+    echo Moving backup to backup-old ...
+    mv -f /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
+       /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION-old.tar.bz2
 fi
 echo First we made a backup of all files that was inside of the
 echo update archive. This may take a while ...
@@ -109,11 +109,26 @@ rm -f /opt/pakfire/db/lists/*list.db
 echo IPFire v$NEWVERSION - www.ipfire.org > /etc/issue
 echo =================================== >> /etc/issue
 echo \\n running on \\s \\r \\m >> /etc/issue
-# Core 15 begin
+# Core 16 begin
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 /etc/init.d/mISDN config
-# Core 15 end
-echo
-echo
-echo Update to IPFire $NEWVERSION finished. Please reboot...
+# Core 16 end
+#
+# Remove obsolete packages
+#
+echo '#!/bin/bash'                                        >  /tmp/remove_obsolete_paks 
+echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/remove_obsolete_paks
+echo '    sleep 2'                                        >> /tmp/remove_obsolete_paks
+echo 'done'                                               >> /tmp/remove_obsolete_paks
+echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do'   >> /tmp/remove_obsolete_paks
+echo '    sleep 2'                                        >> /tmp/remove_obsolete_paks
+echo 'done'                                               >> /tmp/remove_obsolete_paks
+echo '/opt/pakfire/pakfire remove zaptel -y'              >> /tmp/remove_obsolete_paks
+echo 'echo'                                               >> /tmp/remove_obsolete_paks
+echo 'echo Update to IPFire $NEWVERSION finished. Please reboot... ' >> /tmp/remove_obsolete_paks
+echo 'echo'                                               >> /tmp/remove_obsolete_paks
+chmod +x /tmp/remove_obsolete_paks
+/tmp/remove_obsolete_paks &
 echo
+echo Please wait until pakfire has ended...
+echo