diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2005-06-20 07:50:23 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2005-06-20 07:50:23 +0000 |
| commit | a36d9001131d5612a2b9ba9b650bd18360a4db4c (patch) | |
| tree | 383300da02e271b96194c5db866013d8c4064b2e /globetrotter | |
| parent | ec0871928685384e06590d2e4fc3c698632103de (diff) | |
| download | drakx-a36d9001131d5612a2b9ba9b650bd18360a4db4c.tar drakx-a36d9001131d5612a2b9ba9b650bd18360a4db4c.tar.gz drakx-a36d9001131d5612a2b9ba9b650bd18360a4db4c.tar.bz2 drakx-a36d9001131d5612a2b9ba9b650bd18360a4db4c.tar.xz drakx-a36d9001131d5612a2b9ba9b650bd18360a4db4c.zip | |
switch from GRUB to LILO since the later now enable to boot from USB
Diffstat (limited to 'globetrotter')
| -rwxr-xr-x | globetrotter/make_live | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/globetrotter/make_live b/globetrotter/make_live index f5ea43bcf..ee600a944 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 grub), + qw(autologin), qw(synaptics), #- network conf: qw(wireless-tools pcmcia-cs), @@ -436,20 +436,18 @@ bootloader::suggest($bootloader, $all_hds, vga_fb => 788, quiet => 1); -# LILO failled to boot from SCSI: -# $bootloader->{method} = 'lilo-graphic'; -$bootloader->{method} = 'grub'; +$bootloader->{method} = 'lilo-graphic'; eval { bootloader::install($bootloader, $all_hds) }; -doRootSubst("$::prefix/boot/grub/menu.lst"); -run_program::rooted($::prefix, 'sh', '/boot/grub/install.sh'); +doRootSubst("$::prefix/etc/lilo.conf"); +run_program::rooted($::prefix, 'lilo'); -# 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 :-(): |