From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 16 Nov 2014 10:38:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/seventeen' into seventeen
X-Git-Tag: v2.17-core87~103^2~16
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=f9921891f4dc3bc2f9be80d2871ce6f766a38e23;hp=c5a5b13e8ed808c726b3bb4142fa3dd49ad9d4a8

Merge remote-tracking branch 'origin/seventeen' into seventeen
---

diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index 043bd4528b..3d59d70c00 100644
--- 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-2013 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
@@ -63,6 +64,8 @@ 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
 #
@@ -70,11 +73,15 @@ 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  
+
+#
+# Update grub2 config
+#
+grub-mkconfig > /boot/grub/grub.cfg
 
-# Default pae and request a reboot if pae is supported
+# 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
diff --git a/src/paks/linux-pae/uninstall.sh b/src/paks/linux-pae/uninstall.sh
index 69c7e565fa..443328b24d 100644
--- a/src/paks/linux-pae/uninstall.sh
+++ b/src/paks/linux-pae/uninstall.sh
@@ -17,15 +17,18 @@
 # 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-2013 IPFire-Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2014 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 remove_files
-rm -rf /boot/ipfirerd-*-pae.img
+rm -rf /boot/initramfs-*-pae.img
+rm -rf /boot/vmlinuz-*-pae
 rm -rf /lib/modules/*-ipfire-pae
-cp /boot/grub/grub.conf /boot/grub/grub-backup-pae_uninstall.conf
-sed -i "/title IPFire (PAE-Kernel)/,+3d" /boot/grub/grub.conf
-grub-set-default 1
+if [ -f /boot/grub/grub.conf ]; then
+	cp /boot/grub/grub.conf /boot/grub/grub-backup-pae_uninstall.conf
+	sed -i "/title IPFire (PAE-Kernel)/,+3d" /boot/grub/grub.conf
+fi
+grub-mkconfig > /boot/grub/grub.cfg
 sync && sync
diff --git a/src/paks/linux-pae/update.sh b/src/paks/linux-pae/update.sh
index 1ad1831a73..00a3c78720 100644
--- a/src/paks/linux-pae/update.sh
+++ b/src/paks/linux-pae/update.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-2013 IPFire-Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2014 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #