Changes to support new etherboot floppy image syntax and file locations.

perl_checker conpliance.

1 files changed, 10 insertions, 9 deletions

diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ
index 04885cec8..1a9c0f9b5 100755
--- a/perl-install/standalone/drakTermServ
+++ b/perl-install/standalone/drakTermServ
@@ -399,14 +399,14 @@ N("        - Maintain /etc/dhcpd.conf:
 			names like boot-3c59x.nbi, rather than boot-3c59x.2.4.19-16mdk.nbi).
 			 
         	A typical dhcpd.conf stanza to support a diskless client looks like:") . "\n\n" .
-"			host curly {
+'			host curly {
 				hardware ethernet        00:20:af:2f:f7:9d;
 				fixed-address              192.168.192.3;
 				#type                          fat;
-				filename                      \"i386/boot/boot-3c509.2.4.18-6mdk.nbi\";
+				filename                       "i386/boot/boot-3c509.2.4.18-6mdk.nbi";
 				#hdw_config                true;
 			}
-			" . "\n" .
+			' . "\n" .
 N("        While you can use a pool of IP addresses, rather than setup a specific entry for
         a client machine, using a fixed address scheme facilitates using the functionality
         of client-specific configuration files that ClusterNFS provides.
@@ -485,15 +485,16 @@ N("        - Create etherboot floppies/CDs:
         		
         	A basic example of creating a boot floppy for a 3Com 3c509 manually:
         		
-        	cat /usr/lib/etherboot/boot1a.bin \\
-        		/usr/lib/etherboot/lzrom/3c509.lzrom > /dev/fd0") . "\n\n");
+        	cat /usr/lib/etherboot/floppyload.bin \\
+        		/usr/share/etherboot/start16.bin \\			
+        		/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0") . "\n\n");
 }
 
 sub make_boot() {
 	#- make a boot image on floppy or iso from etherboot images
 	my $boot_box;
-	my $rom_path = "/usr/lib/etherboot";
-	my @nics = all("/usr/lib/etherboot/lzrom");
+	my $rom_path = "/usr/share/etherboot";
+	my @nics = all("/usr/share/etherboot/zimg");
 	my $list_nics = new Gtk2::List();
 	my $nic;
 	
@@ -1184,7 +1185,7 @@ sub write_eb_image {
 		if (-e "/dev/fd0") {
 			my $result = $in->ask_okcancel('', N("Please insert floppy disk:"));
 			return if !($result);
-			$result = system("cat $rom_path/boot1a.bin $rom_path/lzrom/$nic > /dev/fd0") if $result;
+			$result = system("cat $rom_path/floppyload.bin $rom_path/start16.bin $rom_path/zimg/$nic > /dev/fd0") if $result;
 			if ($result) {
 				$in->ask_warn('', N("Couldn't access the floppy!"))
 			} else {
@@ -1195,7 +1196,7 @@ sub write_eb_image {
 		}
 	} else {
 		mkdir_p("/tmp/eb");
-		system("cat $rom_path/boot1a.bin $rom_path/lzrom/$nic > /tmp/eb/eb.img");
+		system("cat $rom_path/floppyload.bin $rom_path/start16.bin $rom_path/zimg/$nic > /tmp/eb/eb.img");
 		system("dd if=/dev/zero of=/tmp/eb/eb.img bs=512 seek=72 count=2808");
 		system("mkisofs -b eb.img -o /tmp/$nic.iso /tmp/eb");
 		rm_rf("/tmp/eb");