From 22b7ad291f335a4ff358dc43eb780d17f5d8f46a Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Mon, 6 Jun 2011 15:49:03 +0400 Subject: [PATCH] Fix grub templates. --- install/1merge/grub2/.calculate_directory | 2 +- install/1merge/grub2/update-grub | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/1merge/grub2/.calculate_directory b/install/1merge/grub2/.calculate_directory index 381dc59..39d48c2 100644 --- a/install/1merge/grub2/.calculate_directory +++ b/install/1merge/grub2/.calculate_directory @@ -1,2 +1,2 @@ -# Calculate name=grub belong(grub2)!=&&cl_chroot_status==off&&pkg(sys-boot/grub)>=1.99 path=/boot +# Calculate name=grub belong(grub)!=&&cl_chroot_status==off&&pkg(sys-boot/grub)>=1.99 path=/boot diff --git a/install/1merge/grub2/update-grub b/install/1merge/grub2/update-grub index c66f4a2..d574225 100644 --- a/install/1merge/grub2/update-grub +++ b/install/1merge/grub2/update-grub @@ -1,3 +1,3 @@ -# Calculate path=/tmp exec=/bin/bash +# Calculate path=/tmp exec=/bin/bash os_install_root_type!=livecd CHROOT_PATH=#-cl_chroot_grub-# /sbin/grub-mkconfig >#-cl_chroot_path-#/boot/grub/grub.cfg 2>/dev/null