Merge remote-tracking branch 'stevee/axel-log-fix' into axel-fixperms

[people/teissler/ipfire-2.x.git] / src / paks / linux-pae / install.sh

diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index e323ee81f484bf9237b6d3073025bf2124b7ca60..ab740512fea6ad97e8811fa89c408686a82d9345 100644 (file)
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -17,14 +17,14 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2010 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2007-2013 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 extract_files
 #
-KVER=2.6.32.26
+KVER=xxxKVERxxx
 ROOT=`mount | grep " / " | cut -d" " -f1`
 ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
 if [ ! -z $ROOTUUID ]; then
@@ -43,16 +43,24 @@ ENTRY=`grep "savedefault" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
 echo $ENTRY > /dev/null
 let ENTRY=$_+1
+
+#Check if the system use serial console...
+if [ "$(grep "^serial" /boot/grub/grub.conf)" == "" ]; then
+       console=""
+else
+       console=" console=ttyS0,115200n8"
+fi
+
 #
 # backup grub.conf
 #
-cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-pae.conf
+cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-pae_install.conf
 #
 # Add new Entry to grub.conf
 #
 echo "" >> /boot/grub/grub.conf
 echo "title IPFire (PAE-Kernel)" >> /boot/grub/grub.conf
-echo "  kernel /vmlinuz-$KVER-ipfire-pae root=$ROOT rootdelay=10 panic=10 $MOUNT" >> /boot/grub/grub.conf
+echo "  kernel /vmlinuz-$KVER-ipfire-pae root=$ROOT panic=10$console $MOUNT" >> /boot/grub/grub.conf
 echo "  initrd /ipfirerd-$KVER-pae.img" >> /boot/grub/grub.conf
 echo "  savedefault $ENTRY" >> /boot/grub/grub.conf
 #
@@ -63,3 +71,10 @@ echo "  savedefault $ENTRY" >> /boot/grub/grub.conf
 # Create new module depency
 #
 depmod -a $KVER-ipfire-pae
+
+# Default pae and request a reboot if pae is supported
+if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+       grub-set-default $ENTRY
+       touch /var/run/need_reboot
+fi
+sync && sync
\ No newline at end of file