[arch-commits] Commit in grub2/trunk (PKGBUILD grub2.install)

[Ronald van Haren]

    Date: Saturday, January 29, 2011 @ 08:15:44
  Author: ronald
Revision: 108098

upgpkg: grub2 1.99~rc1-3
move grub.cfg.pacsave to grub.cfg on first install so user config keeps being used

Modified:
  grub2/trunk/PKGBUILD
  grub2/trunk/grub2.install

---------------+
 PKGBUILD      |    2 +-
 grub2.install |   13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-29 12:52:50 UTC (rev 108097)
+++ PKGBUILD	2011-01-29 13:15:44 UTC (rev 108098)
@@ -11,7 +11,7 @@
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase="grub2"
 pkgver='1.99~rc1'
-pkgrel=2
+pkgrel=3
 url="http://www.gnu.org/software/grub/"
 arch=('i686' 'x86_64')
 license=('GPL3')

Modified: grub2.install
===================================================================
--- grub2.install	2011-01-29 12:52:50 UTC (rev 108097)
+++ grub2.install	2011-01-29 13:15:44 UTC (rev 108098)
@@ -1,4 +1,10 @@
 post_install() {
+
+ if [ -f /boot/grub/grub.cfg.pacsave ]; then
+   echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg"
+   install -Dm644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
+ fi
+
  echo -n "Generating grub.cfg.example config file... "
  grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null
  echo "done."
@@ -14,6 +20,11 @@
 
 
 post_upgrade() {
-        post_install
+cat << EOF
+ An example config file is created at /boot/grub/grub.cfg.example
+
+ For more information and additional config settings please see http://wiki.archlinux.org/index.php/GRUB2
+
+EOF
 }