Merge branch 'master' into next

diff --git a/config/rootfiles/core/51/update.sh b/config/rootfiles/core/51/update.sh
index 201c2db4a0abcf204efcfdbcf15b3f61f03035b3..58a47da0d3e33b4b49ff5d72a70c3d106f844429 100644 (file)
--- a/config/rootfiles/core/51/update.sh
+++ b/config/rootfiles/core/51/update.sh
@@ -143,6 +143,11 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 #
 rm -rf /etc/sysconfig/lm_sensors
 
+# Ensure that all data was written...
+sync
+sync
+sync
+
 # Reboot message to console
 /usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Upgrade finished. If you use a customized grub.cfg"
 /usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Check it before reboot !!!"
@@ -155,5 +160,12 @@ touch /var/run/need_reboot
 #Finish
 /etc/init.d/fireinfo start
 sendprofile
+
+# Ensure that all data was written...
+sync
+sync
+sync
+
+#
 #Don't report the exitcode last command
 exit 0

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index 4a6ca2a09d0641586807909697abe13f169fce63..322b3c39ce55b5fb473254bc61d8ec1005d0f0a5 100644 (file)
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.9.i586-full-core50.iso.torrent
+var/ipfire/seeder/ipfire-2.9.i586-full-core51.iso.torrent
 #var/log/seeder
 var/log/seeder/info

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index a4e120bd8c95b91f7f5b13ee9d6763ba7f862666..0fd2f3c9130fa3eccccf26c61e6625c7fd6eb8c1 100644 (file)
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -27,13 +27,13 @@ include Config
 VER        = 1.00
 
 THISAPP    = ipfireseeder-$(VER)
-DL_FILE    = ipfire-2.9.i586-full-core50.iso.torrent
+DL_FILE    = ipfire-2.9.i586-full-core51.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 26
+PAK_VER    = 27
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 07d3b03c3042f67464a33319207d2795
+$(DL_FILE)_MD5 = fa40cd03e4b0a11f8f703595a5c01a76
 
 install : $(TARGET)