summaryrefslogtreecommitdiffstats
path: root/globetrotter
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-06-20 07:51:09 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-06-20 07:51:09 +0000
commit72221ab449f67492ef46b1d4d868fb44eb55a1b7 (patch)
treefe0aa4074dd2cc16047278cf6932a0890a8f3163 /globetrotter
parent09c8a790507f04289d5cd1bd55a37e01553208db (diff)
downloaddrakx-72221ab449f67492ef46b1d4d868fb44eb55a1b7.tar
drakx-72221ab449f67492ef46b1d4d868fb44eb55a1b7.tar.gz
drakx-72221ab449f67492ef46b1d4d868fb44eb55a1b7.tar.bz2
drakx-72221ab449f67492ef46b1d4d868fb44eb55a1b7.tar.xz
drakx-72221ab449f67492ef46b1d4d868fb44eb55a1b7.zip
rollback
Diffstat (limited to 'globetrotter')
-rwxr-xr-xglobetrotter/make_live20
1 files changed, 11 insertions, 9 deletions
diff --git a/globetrotter/make_live b/globetrotter/make_live
index ee600a944..f5ea43bcf 100755
--- a/globetrotter/make_live
+++ b/globetrotter/make_live
@@ -231,7 +231,7 @@ sub installPackages() {
qw(mountloop), #- crypted folders
#- doc:
(map { "mandrake-doc-$_" } map { ("Drakxtools-Guide-$_", "Command-Line-$_", "Quick-Startup-Plus-$_", "Starter-$_") } qw(de en es fr it)),
- qw(autologin),
+ qw(autologin grub),
qw(synaptics),
#- network conf:
qw(wireless-tools pcmcia-cs),
@@ -436,18 +436,20 @@ bootloader::suggest($bootloader, $all_hds,
vga_fb => 788,
quiet => 1);
-$bootloader->{method} = 'lilo-graphic';
+# LILO failled to boot from SCSI:
+# $bootloader->{method} = 'lilo-graphic';
+$bootloader->{method} = 'grub';
eval { bootloader::install($bootloader, $all_hds) };
-doRootSubst("$::prefix/etc/lilo.conf");
-run_program::rooted($::prefix, 'lilo');
+doRootSubst("$::prefix/boot/grub/menu.lst");
+run_program::rooted($::prefix, 'sh', '/boot/grub/install.sh');
-## fix GRUB configuration:
-#substInFile {
-# # use FB by default on versionned entries so that the initial versionned entry behave like those created by /sbin/installkernel:
-# s/$/ vga=788/ if /^kernel.*\d\.\d\.\d/;
-#} "$::prefix/boot/grub/menu.lst";
+# fix GRUB configuration:
+substInFile {
+ # use FB by default on versionned entries so that the initial versionned entry behave like those created by /sbin/installkernel:
+ s/$/ vga=788/ if /^kernel.*\d\.\d\.\d/;
+} "$::prefix/boot/grub/menu.lst";
## disable ISDN by default (bogus isdn4net came with an enabled interface :-():