summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-23 12:19:07 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-23 12:19:07 +0000
commit03ae5d2a98d2356584ca88df2cde396d575164f4 (patch)
tree266815ffc2494759c51e55c99e75a6aca563ebd6
parent334f1d91db6fd53b7ce8ce39a61388db4932337a (diff)
downloaddrakx-backup-do-not-use-03ae5d2a98d2356584ca88df2cde396d575164f4.tar
drakx-backup-do-not-use-03ae5d2a98d2356584ca88df2cde396d575164f4.tar.gz
drakx-backup-do-not-use-03ae5d2a98d2356584ca88df2cde396d575164f4.tar.bz2
drakx-backup-do-not-use-03ae5d2a98d2356584ca88df2cde396d575164f4.tar.xz
drakx-backup-do-not-use-03ae5d2a98d2356584ca88df2cde396d575164f4.zip
as we now have menu.lst.example, i remove automatic.para for more flexibility
-rwxr-xr-xtools/i386/netboot/make_boot_network5
-rw-r--r--tools/i386/netboot/menu.lst.example2
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/i386/netboot/make_boot_network b/tools/i386/netboot/make_boot_network
index b9739c486..f75092cd7 100755
--- a/tools/i386/netboot/make_boot_network
+++ b/tools/i386/netboot/make_boot_network
@@ -4,15 +4,14 @@ type=$1
#[ -z "$type" ] && { echo "usage: $0 <network card type> (eg: 3c59x)" ; exit 1; }
[ -z "$type" ] && type=3c90x
-[ -e automatic.para ] || { echo "missing file automatic.para, create one based on automatic.para.default"; exit 1; }
+[ -e menu.lst ] || { echo "missing file menu.lst, create one based on menu.lst.example"; exit 1; }
ln -sf stage1.$type stage1
ln -sf stage2.$type stage2
mformat a:
mcopy {stage1,stage2} a:
-perl -pe 'chomp; $_ .= " " . `cat automatic.para` if /^kernel/; $_ .= "\n"' menu.lst | mcopy - a:menu.lst
-
+mcopy menu.lst a:menu.lst
./grub --batch <<EOF
install (fd0)/stage1 d (fd0) (fd0)/stage2 p (fd0)/menu.lst $automatic
diff --git a/tools/i386/netboot/menu.lst.example b/tools/i386/netboot/menu.lst.example
index b8f088220..8f18a5313 100644
--- a/tools/i386/netboot/menu.lst.example
+++ b/tools/i386/netboot/menu.lst.example
@@ -3,5 +3,5 @@ timeout 0
title linux
dhcp
tftpserver 192.168.1.9
-kernel (nd)/var/lib/tftpboot/vmlinuz ramdisk=32000 vga=788 kickstart=Mandrake/base/auto_inst.cfg.pl useless_thing_accepted
+kernel (nd)/var/lib/tftpboot/vmlinuz ramdisk=32000 vga=788 kickstart=Mandrake/base/auto_inst.cfg.pl useless_thing_accepted automatic=method:ftp,network:static,ip:192.168.100.25,dns:192.168.100.11,server:192.168.100.39,directory:/export,user:a,pass:a
initrd (nd)/var/lib/tftpboot/network.rdz