Merge remote-tracking branch 'origin/next' into thirteen

[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 60f8bbb42e31f3e949027e792ae79885ea12a186..59e17bfecf404cfee50a37063cde7be105a16d3c 100644 (file)
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -48,7 +48,7 @@ let ENTRY=$_+1
 if [ "$(grep "^serial" /boot/grub/grub.conf)" == "" ]; then
        console=""
 else
-       console=" console=ttyS0,38400n8"
+       console=" console=ttyS0,115200n8"
 fi
 
 #
@@ -71,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