summaryrefslogtreecommitdiffstats
path: root/globetrotter
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-06-20 07:52:07 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-06-20 07:52:07 +0000
commit24dd437935440d906f5bb842d825e5dc7dfad40b (patch)
tree22523a3034fb583317572cb6d3943dddf23f8f15 /globetrotter
parent72221ab449f67492ef46b1d4d868fb44eb55a1b7 (diff)
downloaddrakx-24dd437935440d906f5bb842d825e5dc7dfad40b.tar
drakx-24dd437935440d906f5bb842d825e5dc7dfad40b.tar.gz
drakx-24dd437935440d906f5bb842d825e5dc7dfad40b.tar.bz2
drakx-24dd437935440d906f5bb842d825e5dc7dfad40b.tar.xz
drakx-24dd437935440d906f5bb842d825e5dc7dfad40b.zip
switch from GRUB to LILO since the later now enable to boot from USB
Diffstat (limited to 'globetrotter')
-rwxr-xr-xglobetrotter/make_live17
1 files changed, 7 insertions, 10 deletions
diff --git a/globetrotter/make_live b/globetrotter/make_live
index f5ea43bcf..e3f8bc863 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,21 +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");
-# fix GRUB configuration:
+# fix LILO 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";
+ s!root=(LABEL=MDK-ROOT)!root="\1"!g;
+} "$::prefix/etc/lilo.conf";
+run_program::rooted($::prefix, 'lilo');
## disable ISDN by default (bogus isdn4net came with an enabled interface :-():
#substInFile {