From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, seventeen, updated. da4529ae5110d3e33d0f15338da5288728352d39
Date: Sun, 16 Nov 2014 10:08:25 +0100 [thread overview]
Message-ID: <20141116090826.1E52621022@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 5198 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, seventeen has been updated
via da4529ae5110d3e33d0f15338da5288728352d39 (commit)
from 817317ed9e961e39a2a3b643e15426b9da5b83a3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit da4529ae5110d3e33d0f15338da5288728352d39
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Nov 16 10:07:33 2014 +0100
kernel-pae: update un/install scripts for grub2.
-----------------------------------------------------------------------
Summary of changes:
src/paks/linux-pae/install.sh | 15 +++++++++++----
src/paks/linux-pae/uninstall.sh | 13 ++++++++-----
src/paks/linux-pae/update.sh | 2 +-
3 files changed, 20 insertions(+), 10 deletions(-)
Difference in files:
diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index 043bd45..3d59d70 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(a)ipfire.org>. #
+# Copyright (C) 2007-2014 IPFire-Team <info(a)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 69c7e56..443328b 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(a)ipfire.org>. #
+# Copyright (C) 2007-2014 IPFire-Team <info(a)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 1ad1831..00a3c78 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(a)ipfire.org>. #
+# Copyright (C) 2007-2014 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2014-11-16 9:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141116090826.1E52621022@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox