From fb311626f9b9c0ad17af504408c2aba8ac80b536 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Sun, 26 Jul 2009 18:19:32 +0200 Subject: no more need for the grub hacks --- examples/fancy-install-on-sda | 7 ------- tests/runtime/automatic-lvm-dmcrypt-install-sda/profile | 8 -------- 2 files changed, 15 deletions(-) diff --git a/examples/fancy-install-on-sda b/examples/fancy-install-on-sda index 819e7f3..6a34972 100644 --- a/examples/fancy-install-on-sda +++ b/examples/fancy-install-on-sda @@ -1,7 +1,5 @@ # this config is like generic-install-on-sda (check out that file first), but more fancy -phase_finish=(msg_report grub_hack) - SOURCE=cd FILE_URL=file:///src/core/pkg SYNC_URL= @@ -24,11 +22,6 @@ worker_configure_system () { sed -i 's/filesystems/usbinput keymap encrypt lvm2 filesystems/' $var_TARGET_DIR/etc/mkinitcpio.conf } -# aif code doesn't nicely update grub config automatically for lvm/dm_crypt systems yet, so we have to do it with this hack -worker_grub_hack () { - sed -i 's#root=/dev/sda.*#root=/dev/mapper/cryptpool-cryptroot cryptdevice=/dev/sda2:cryptpool ro#' $var_TARGET_DIR/boot/grub/menu.lst -} - # These variables are mandatory GRUB_DEVICE=/dev/sda diff --git a/tests/runtime/automatic-lvm-dmcrypt-install-sda/profile b/tests/runtime/automatic-lvm-dmcrypt-install-sda/profile index d7ef233..f59de0a 100644 --- a/tests/runtime/automatic-lvm-dmcrypt-install-sda/profile +++ b/tests/runtime/automatic-lvm-dmcrypt-install-sda/profile @@ -1,6 +1,3 @@ -phase_finish=(msg_report grub_hack) - - SOURCE=cd FILE_URL=file:///src/core/pkg SYNC_URL= @@ -17,11 +14,6 @@ worker_configure_system () { sed -i 's/filesystems/usbinput keymap encrypt lvm2 filesystems/' $var_TARGET_DIR/etc/mkinitcpio.conf } -# aif code doesn't nicely update grub config automatically for lvm/dm_crypt systems yet, so we have to do it with this hack -worker_grub_hack () { - sed -i 's#root=/dev/sda.*#root=/dev/mapper/cryptpool-cryptroot cryptdevice=/dev/sda2:cryptpool ro#' $var_TARGET_DIR/boot/grub/menu.lst -} - # These variables are mandatory GRUB_DEVICE=/dev/sda -- cgit v1.2.3-54-g00ecf