kernel-pae: update un/install scripts for grub2.

[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..3d59d70c00c3aacdd4042f7736e8007ef966704a 100644 (file)
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007-2011 IPFire-Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2014 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
@@ -31,6 +31,7 @@ if [ ! -z $ROOTUUID ]; then
        ROOT="UUID=$ROOTUUID"
 fi
 
+if [ -f /boot/grub/grub.conf ]; then
 MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
 echo $MOUNT > /dev/null
@@ -48,13 +49,13 @@ let ENTRY=$_+1
 if [ "$(grep "^serial" /boot/grub/grub.conf)" == "" ]; then
        console=""
 else
-       console=" console=ttyS0,38400n8"
+       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
 #
@@ -63,11 +64,24 @@ echo "title IPFire (PAE-Kernel)" >> /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
+fi
+
+#
+# Create new module depency
+#
+depmod -a $KVER-ipfire-pae
 #
 # Made initramdisk
 #
-/sbin/dracut --force --verbose /boot/ipfirerd-$KVER-pae.img $KVER-ipfire-pae
+/usr/bin/dracut --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae  
+
 #
-# Create new module depency
+# Update grub2 config
 #
-depmod -a $KVER-ipfire-pae
+grub-mkconfig > /boot/grub/grub.cfg
+
+# request a reboot if pae is supported
+if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+       touch /var/run/need_reboot
+fi
+sync && sync
\ No newline at end of file