Date: Tuesday, March 16, 2010 @ 15:05:26 Author: ronald Revision: 72473
fix merge error Modified: grub2/repos/extra-i686/PKGBUILD grub2/repos/extra-i686/grub2.install ---------------+ PKGBUILD | 3 ++- grub2.install | 17 +++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-03-16 19:04:58 UTC (rev 72472) +++ PKGBUILD 2010-03-16 19:05:26 UTC (rev 72473) @@ -4,7 +4,7 @@ pkgname=grub2 pkgver=1.98 -pkgrel=2 +pkgrel=3 pkgdesc="The GNU GRand Unified Bootloader" url="http://www.gnu.org/software/grub/" arch=('i686' 'x86_64') @@ -12,6 +12,7 @@ depends=('sh' 'lzo2' 'freetype2') optdepends=('ruby:usr/share/grub/genmk.rb script' 'libusb: /sbin/grub-emu') makedepends=('bdf-unifont' 'ruby') +backup=('boot/grub/grub.cfg') conflicts=('grub') provides=('grub') install=${pkgname}.install Modified: grub2.install =================================================================== --- grub2.install 2010-03-16 19:04:58 UTC (rev 72472) +++ grub2.install 2010-03-16 19:05:26 UTC (rev 72473) @@ -1,18 +1,19 @@ post_install() { -if [ ! -f /boot/grub/grub.cfg ]; then - echo -n "Generating grub.cfg config file... " - grub-mkconfig -o /boot/grub/grub.cfg 2> /dev/null + echo -n "Generating grub.cfg.example config file... " + grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null echo "done." -fi + cat << EOF - Please verify the config file installed in /boot/grub/grub.cfg + An example config file is created at /boot/grug/grub.cfg.example + For more information and additional config settings please see http://wiki.archlinux.org/index.php/GRUB2 - GRUB2 is still expiremental and under heavy development!. - Only install it if you know what you are doing. - EOF } +post_upgrade() { + post_install +} +