summaryrefslogtreecommitdiff
path: root/src/core/procedures
diff options
context:
space:
mode:
authorGerhard Brauer <gerbra@archlinux.de>2009-07-29 20:13:26 +0200
committerDieter Plaetinck <dieter@plaetinck.be>2009-07-29 20:16:48 +0200
commit57344fc7a3d918314fab9626ec27976e55af6bab (patch)
tree0cce406256608cdb6f106f7ddd5087ebd09f750f /src/core/procedures
parent6abf8e0fddc7b47ae4a709a67ebdef8e10a11275 (diff)
Several grub related fixes
Attached the extended patch, this replaced the one from my earlier mail. * Fixed grub device mapping in automatic procedure * Fixed bootdevice handling either if we use a seperate /boot or not in automatic procedure. * Added a hint to Luks passphrasing during process_filesystem The test i have made: a) automatic-lvm-dmcrypt-install-sda: menu.lst ok, HOOKS ok, Boot is fine.... b) generic-install-sda: menu.lst ok, HOOKs ok, boot ok c) generic-install-sda (but without seperate /boot partiton, sda1=swap sda2=/) menu.lst ok, HOOKs ok, boot ok d) fancy-install-on-sda Fails on creating all filesystems/lvm-partitions here, but this is because my Virtualbox VM has a too small disk http://users.archlinux.de/~gerbra/tmp/fancy-install-sda.png http://users.archlinux.de/~gerbra/tmp/fancy-install-sda-tty7.png With this changes i build now a new local iso here and test again a interactive install (no lvm,no crypt, only a normal install) to see if we hurt something in interactive... But i guess not.... Gerhard
Diffstat (limited to 'src/core/procedures')
-rw-r--r--src/core/procedures/automatic5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/procedures/automatic b/src/core/procedures/automatic
index 80aecfc..1fae06d 100644
--- a/src/core/procedures/automatic
+++ b/src/core/procedures/automatic
@@ -132,6 +132,11 @@ worker_configure_system () {
worker_install_bootloader ()
{
+ get_grub_map
grub-install $var_GRUB_DEVICE --root-directory=/mnt
+ # check if we have a seperate bootdev (/boot)
+ # ToDo: This is double-work, find a better place!
+ # See comment in generate_grub_menulst and interactive_grub
+ bootdev=$(mount | grep $var_TARGET_DIR/boot | cut -d' ' -f 1)
generate_grub_menulst
}