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

config/backup/backup.pl

@@ -76,6 +76,9 @@ elsif ($ARGV[0] eq 'addonbackup') {
 elsif ($ARGV[0] =~ /ipf$/ ) {
   system("rm /var/ipfire/backup/$ARGV[0]");
 }
+elsif ($ARGV[0] =~ /iso$/ ) {
+  system("rm /var/tmp/backupiso/$ARGV[0]");
+}
 elsif ($ARGV[0] eq '') {
  printf "No argument given, please use <include><exclude><cli>\n"
 }

config/cron/crontab

@@ -22,7 +22,7 @@ HOME=/
 
 # Make some nice graphs
 */5 * * * * 	/usr/local/bin/makegraphs >/dev/null
-01 * * * * 	/etc/init.d/collectd backup >/dev/null
+* 05 * * * 	/etc/init.d/collectd backup >/dev/null
 
 # Force update the dynamic dns registration once a week
 # Force update even if IP has not changed once a month if 'minimize update' selected in GUI
@@ -37,7 +37,7 @@ HOME=/
 		find /var/log/logwatch/ -ctime +${LOGWATCH_KEEP=56} -exec rm -f '{}' ';'
 
 # hddshutdown
-02 * * * * 	/usr/local/bin/hddshutdown >/dev/null
+*/30 * * * * 	/usr/local/bin/hddshutdown >/dev/null
 
 # connection-scheduler
 */5 * * * *	/usr/local/bin/connscheduler timer > /dev/null

config/rootfiles/common/lm_sensors

@@ -16,7 +16,7 @@ usr/lib/libsensors.so.4.0.2
 #usr/man/man8/isadump.8
 #usr/man/man8/isaset.8
 #usr/man/man8/pwmconfig.8
-#usr/local/man/man8/sensors-detect.8
+#usr/man/man8/sensors-detect.8
 usr/sbin/fancontrol
 usr/sbin/isadump
 usr/sbin/isaset

config/rootfiles/common/vim

@@ -617,7 +617,7 @@ usr/bin/vim
 #usr/share/vim/vim70/syntax/blank.vim
 #usr/share/vim/vim70/syntax/bst.vim
 #usr/share/vim/vim70/syntax/btm.vim
-#usr/share/vim/vim70/syntax/c.vim
+usr/share/vim/vim70/syntax/c.vim
 #usr/share/vim/vim70/syntax/calendar.vim
 #usr/share/vim/vim70/syntax/catalog.vim
 #usr/share/vim/vim70/syntax/cdl.vim
@@ -667,7 +667,7 @@ usr/bin/vim
 #usr/share/vim/vim70/syntax/desktop.vim
 #usr/share/vim/vim70/syntax/dictconf.vim
 #usr/share/vim/vim70/syntax/dictdconf.vim
-#usr/share/vim/vim70/syntax/diff.vim
+usr/share/vim/vim70/syntax/diff.vim
 #usr/share/vim/vim70/syntax/dircolors.vim
 #usr/share/vim/vim70/syntax/diva.vim
 #usr/share/vim/vim70/syntax/django.vim
@@ -712,7 +712,7 @@ usr/bin/vim
 #usr/share/vim/vim70/syntax/forth.vim
 #usr/share/vim/vim70/syntax/fortran.vim
 #usr/share/vim/vim70/syntax/foxpro.vim
-#usr/share/vim/vim70/syntax/fstab.vim
+usr/share/vim/vim70/syntax/fstab.vim
 #usr/share/vim/vim70/syntax/fvwm.vim
 #usr/share/vim/vim70/syntax/fvwm2m4.vim
 #usr/share/vim/vim70/syntax/gdb.vim
@@ -856,7 +856,7 @@ usr/bin/vim
 #usr/share/vim/vim70/syntax/passwd.vim
 #usr/share/vim/vim70/syntax/pcap.vim
 #usr/share/vim/vim70/syntax/pccts.vim
-#usr/share/vim/vim70/syntax/perl.vim
+usr/share/vim/vim70/syntax/perl.vim
 #usr/share/vim/vim70/syntax/pf.vim
 #usr/share/vim/vim70/syntax/pfmain.vim
 #usr/share/vim/vim70/syntax/php.vim
@@ -886,7 +886,7 @@ usr/bin/vim
 #usr/share/vim/vim70/syntax/ptcap.vim
 #usr/share/vim/vim70/syntax/purifylog.vim
 #usr/share/vim/vim70/syntax/pyrex.vim
-#usr/share/vim/vim70/syntax/python.vim
+usr/share/vim/vim70/syntax/python.vim
 #usr/share/vim/vim70/syntax/qf.vim
 #usr/share/vim/vim70/syntax/quake.vim
 #usr/share/vim/vim70/syntax/r.vim
@@ -927,7 +927,7 @@ usr/bin/vim
 #usr/share/vim/vim70/syntax/sgml.vim
 #usr/share/vim/vim70/syntax/sgmldecl.vim
 #usr/share/vim/vim70/syntax/sgmllnx.vim
-#usr/share/vim/vim70/syntax/sh.vim
+usr/share/vim/vim70/syntax/sh.vim
 #usr/share/vim/vim70/syntax/sicad.vim
 #usr/share/vim/vim70/syntax/sieve.vim
 #usr/share/vim/vim70/syntax/simula.vim
@@ -973,12 +973,12 @@ usr/bin/vim
 #usr/share/vim/vim70/syntax/st.vim
 #usr/share/vim/vim70/syntax/stata.vim
 #usr/share/vim/vim70/syntax/stp.vim
-#usr/share/vim/vim70/syntax/strace.vim
+usr/share/vim/vim70/syntax/strace.vim
 #usr/share/vim/vim70/syntax/sudoers.vim
 #usr/share/vim/vim70/syntax/svn.vim
 #usr/share/vim/vim70/syntax/syncolor.vim
 #usr/share/vim/vim70/syntax/synload.vim
-#usr/share/vim/vim70/syntax/syntax.vim
+usr/share/vim/vim70/syntax/syntax.vim
 #usr/share/vim/vim70/syntax/sysctl.vim
 #usr/share/vim/vim70/syntax/tads.vim
 #usr/share/vim/vim70/syntax/tags.vim

config/rootfiles/updater/update.sh

@@ -170,9 +170,11 @@ echo \\n running on \\s \\r \\m >> /etc/issue
 #
 # Update crontab
 #
-grep -v "ipacsum" /var/spool/cron/root.orig > /tmp/root.orig.tmp
+grep -v "ipacsum" /var/spool/cron/root.orig | grep -v "hddshutdown" > /tmp/root.orig.tmp
 echo "# Backup collectd files" >> /tmp/root.orig.tmp
-echo "01 * * * *	/etc/init.d/collectd backup >/dev/null" >> /tmp/root.orig.tmp
+echo "* 05 * * *	/etc/init.d/collectd backup >/dev/null" >> /tmp/root.orig.tmp
+echo "# hddshutdown" >> /tmp/root.orig.tmp
+echo "*/30 * * * * 	/usr/local/bin/hddshutdown >/dev/null" >> /tmp/root.orig.tmp
 mv /tmp/root.orig.tmp /var/spool/cron/root.orig
 chmod 600 /var/spool/cron/root.orig
 chown root:cron /var/spool/cron/root.orig

config/syslinux/options.msg

@@ -9,7 +9,7 @@
 
  -  To test the memory in your system type: 04memtest <ENTER>07.
 
-
+ -  To install in unattended mode, type: 04unattended <ENTER>07.
 
 
 

config/syslinux/syslinux.cfg

@@ -11,6 +11,9 @@ LABEL novga
 LABEL dma
   KERNEL vmlinuz
   APPEND initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent ro
+LABEL unattended
+  KERNEL vmlinuz
+  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent unattended ro
 LABEL memtest
   KERNEL memtest
   APPEND -

config/syslinux/unattended.conf

@@ -10,4 +10,3 @@ GREEN_NETADDRESS=192.168.180.0
 GREEN_BROADCAST=192.168.180.255
 ROOT_PASSWORD=ipfire
 ADMIN_PASSWORD=ipfire
-RESTORE_FILE=

config/uClibc/busybox.config

@@ -88,7 +88,7 @@ CONFIG_TAR=y
 CONFIG_FEATURE_TAR_BZIP2=y
 # CONFIG_FEATURE_TAR_LZMA is not set
 # CONFIG_FEATURE_TAR_FROM is not set
-# CONFIG_FEATURE_TAR_GZIP is not set
+CONFIG_FEATURE_TAR_GZIP=y
 # CONFIG_FEATURE_TAR_COMPRESS is not set
 CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
 CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y