summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2011-01-08 23:59:43 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2011-01-08 23:59:43 +0100
commitd363fd6c0f45290a30629e571436ec280e5294d0 (patch)
tree5e8b4d8bf28ffff378564faae73ece88d2f19bd0 /src
parent474fff0355e0f3cb19f9afe28c956595e577e0a8 (diff)
properly locate grubmenu
* bugfix: $grubmenu was not set correctly, because $var_TARGET_DIR was not set when grubmenu was being defined * feature: allow more control over on which system (where the root is mounted) to work with
Diffstat (limited to 'src')
-rw-r--r--src/core/libs/lib-ui-interactive.sh2
-rw-r--r--src/core/procedures/base1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index 11cde02..881af90 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -2,7 +2,7 @@
# A library which allows you to do backend stuff by using user interfaces
# Global Variables
-grubmenu="$var_TARGET_DIR/boot/grub/menu.lst"
+grubmenu="/boot/grub/menu.lst" # be sure to override this if you have it somewhere else
# check if a worker has completed successfully. if not -> tell user he must do it + return 1
# if ok -> don't warn anything and return 0
diff --git a/src/core/procedures/base b/src/core/procedures/base
index ab95cea..3ff66b4 100644
--- a/src/core/procedures/base
+++ b/src/core/procedures/base
@@ -10,6 +10,7 @@ var_MIRRORLIST="/etc/pacman.d/mirrorlist"
var_UI_TYPE="cli" # set to cli or dia for dialog
var_ARCH=`uname -m` #i686 or x86_64. NOTE: this assumes you want to install the same arch as the installation environment you're using. maybe we could decouple those someday..
[ -z "$var_ARCH" ] && die_error "Could not determine your architecture"
+grubmenu="$var_TARGET_DIR$grubmenu"
###### Phases ( can be overridden by more specific procedures) ######
phase_preparation=(\