diff options
| author | Gerhard Brauer <gerbra@archlinux.de> | 2009-07-29 20:13:26 +0200 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-07-29 20:16:48 +0200 |
| commit | 57344fc7a3d918314fab9626ec27976e55af6bab (patch) | |
| tree | 0cce406256608cdb6f106f7ddd5087ebd09f750f /src/core/libs/lib-blockdevices-filesystems.sh | |
| parent | 6abf8e0fddc7b47ae4a709a67ebdef8e10a11275 (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/libs/lib-blockdevices-filesystems.sh')
| -rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index a4bc534..e8f358c 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -721,7 +721,9 @@ process_filesystem () swap) mkswap $part $opts >$LOG 2>&1; ret=$? ;; dm_crypt) [ -z "$fs_params" ] && fs_params='-c aes-xts-plain -y -s 512'; fs_params=${fs_params//_/ } + infofy "Please enter your passphrase to encrypt the device (with confirmation)" cryptsetup $fs_params $opts luksFormat -q $part >$LOG 2>&1 < /dev/tty ; ret=$? #hack to give cryptsetup the approriate stdin. keep in mind we're in a loop (see process_filesystems where something else is on stdin) + infofy "Please enter your passphrase to unlock the device" cryptsetup luksOpen $part $fs_label >$LOG 2>&1 < /dev/tty; ret=$? || ( show_warning 'cryptsetup' "Error luksOpening $part on /dev/mapper/$fs_label" ) ;; lvm-pv) pvcreate $fs_opts $part >$LOG 2>&1; ret=$? ;; lvm-vg) # $fs_params: ':'-separated list of PV's |