Merge branch 'master' of ssh://stevee@git.ipfire.org/pub/git/ipfire-2.x

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 886d6d77b01b8d3eacd1be336a9df4a8315d3054..9634460d77fa486dcdb790023acca1694eecaf9f 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -14,6 +14,11 @@ title IPFire (vesafb 640x480)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=785 MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 1
+title IPFire (vesafb 800x600)
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=788 MOUNT
+  initrd /ipfirerd-KVER.img
+  savedefault 1
 title IPFire (vesafb 1024x768)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT

diff --git a/config/httpd/vhosts.d/nagios.conf b/config/httpd/vhosts.d/nagios.conf
index 73a4bd0766587cada899b80cf42c9ca3248d8f0a..78bcd3b00ebbc5ca4439edb0d701d7e7a39ec77f 100644 (file)
--- a/config/httpd/vhosts.d/nagios.conf
+++ b/config/httpd/vhosts.d/nagios.conf
@@ -1,6 +1,6 @@
-Listen 1007
+Listen 1008
 
-<VirtualHost *:1007>
+<VirtualHost *:1008>
 
 # SAMPLE CONFIG SNIPPETS FOR APACHE WEB SERVER
 # Last Modified: 11-26-2005

diff --git a/config/rootfiles/core/28/update.sh b/config/rootfiles/core/28/update.sh
index 3898af0e3112857dbffc7b756838f87a209c8061..24f47df742da90f8ea69afae14b87486a4d4f8d1 100755 (executable)
--- a/config/rootfiles/core/28/update.sh
+++ b/config/rootfiles/core/28/update.sh
@@ -17,13 +17,16 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2008 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2009 IPFire-Team <info@ipfire.org>.                        #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 #
+OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
+NEWVERSION="2.3"
+#
 KVER="2.6.27.20"
 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`
@@ -42,12 +45,14 @@ echo update archive. This may take a while ...
 # Add some files that are not in the package to backup
 echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
 echo boot >> /opt/pakfire/tmp/ROOTFILES
+echo etc/issue >> /opt/pakfire/tmp/ROOTFILES
+echo opt/pakfire/etc/pakfire.conf >> /opt/pakfire/tmp/ROOTFILES
+echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES
 #
-
 tar czvf /var/ipfire/backup/coreupdate28_$KVER.tar.gz.tar.gz \
    -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1
 echo
-echo Update IPfire Kernel to $KVER ...
+echo Update IPfire to $NEWVERSION ...
 # Remove old kernel, configs, initrd, modules ...
 #
 rm -rf /boot/System.map-*
@@ -103,9 +108,23 @@ grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
 #
 #perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 #
+# Delete old lm-sensor modullist...
+#
+rm -rf /etc/sysconfig/lm_sensors
+#
 # Restart snort
 #
 /etc/init.d/snort restart
 #
+# Change version of Pakfire.conf
+#
+sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf
+#
+# Create new issue
+#
+echo IPFire v$NEWVERSION - www.ipfire.org > /etc/issue
+echo =================================== >> /etc/issue
+echo \\n running on \\s \\r \\m >> /etc/issue
+#
 # This core-update need a reboot
-/usr/bin/logger -p syslog.emerg -t core-upgrade-28 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
+/usr/bin/logger -p syslog.emerg -t core-upgrade-28 "Upgrade finished. Please reboot... "

diff --git a/config/rootfiles/packages/nagios b/config/rootfiles/packages/nagios
index 87748cce13c69d1e6c4c5138acc6be559a09e59d..8eac28db2f9192394187a5c705482da552ae9193 100644 (file)
--- a/config/rootfiles/packages/nagios
+++ b/config/rootfiles/packages/nagios
@@ -440,6 +440,8 @@ usr/share/nagios/stylesheets
 #usr/share/nagios/stylesheets/summary.css
 #usr/share/nagios/stylesheets/tac.css
 #usr/share/nagios/stylesheets/trends.css
+var/nagios
 var/nagios/archives
 var/nagios/rw
+var/nagios/spool
 var/nagios/spool/checkresults

diff --git a/src/paks/nagios/install.sh b/src/paks/nagios/install.sh
index 567a2c77f8d1f7132e98efea7beaa42f3eb46304..4abeba6b91abc97a96b2cb377161892947d7d461 100644 (file)
--- a/src/paks/nagios/install.sh
+++ b/src/paks/nagios/install.sh
@@ -24,7 +24,6 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 restore_backup ${NAME}
-chown -R nobody:nobody /var/nagios
 htpasswd -bmc /etc/nagios/htpasswd.users nagiosadmin nagios
 /etc/init.d/apache restart
 start_service --background ${NAME}