webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Tremer
2014-11-16 11:38:45 +01:00
parent c5a5b13e8e da4529ae51
commit f9921891f4
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/paks/linux-pae/install.sh
View File

@@ -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
# Default pae and request a reboot if pae is supported
#
# Update grub2 config
#
grub-mkconfig > /boot/grub/grub.cfg
# 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

13
src/paks/linux-pae/uninstall.sh
View File

@@ -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

2
src/paks/linux-pae/update.sh
View File

@@ -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>. #
# #
############################################################################
#