Changeset 41 for devel/dploy-pxe/bin

Timestamp:

04/15/08 17:49:15 (4 years ago)

Author:

bruno

Message:

Working dploy-add2dhcp with subnet

File:

• devel/dploy-pxe/bin/dploy-add2pxe (modified) (3 diffs)

devel/dploy-pxe/bin/dploy-add2pxe

@@ -3 +3 @@
 use strict;
 use File::Copy;
+use File::Basename;
 
-my $dhcp="/etc/dhcpd.d/dploy.org.conf";
-#
-# /etc/dhcpd.conf should include that line:
-# include "/etc/dhcpd.d/dploy.org.conf";
-# as part of the appropriate range
-# does not support multiple ranges yet
-#
+# Root of the PXE setup
 my $pxe="/tftpboot/pxelinux.cfg";
-# Where to find the LinuxCOE created ISO
+# Where to find the LinuxCOE created ISO on the SystemDesigner server
 my $linuxcoe="/var/ftp/html/scratch_monkey/systemdesigner";
+# Where to find the Mondorescue created ISO on the Images server
+my $mondorescue="/var/ftp/html/mondorescue/iso";
 # temporary mountpoint
-my $mnt="/tmp/mnt-linuxcoe";
+my $mnt="/tmp/mnt-dploy";
 
-my $mac=$ARGV[0];
+my $mac=$ARGV[0] || "";
 
 if ($mac !~ /^(?:[[:xdigit:]]{1,2}[-:]){5}[[:xdigit:]]{1,2}$/) {
-    print "Syntax: add2pxe MAC ip url-to-LinuxCOE-iso\n";
-    exit(-1);
+        print "Syntax: dploy-add2pxe MAC url-to-iso\n";
+        exit(-1);
 }
 
-my $ip=$ARGV[1];
-
-if ($ip !~ /^([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])$/) {
-    print "Syntax: add2pxe mac IP url-to-LinuxCOE-iso\n";
-    exit(-1);
-}
-
-my $url=$ARGV[2];
-
-if ($url !~ /(\w+):\/\/([^\/:]+)(:\d+)?\/(.*)/) {
-    print "Syntax: add2pxe mac ip URL-TO-LinuxCOE-ISO\n";
-    exit(-1);
-}
-
-# Reads existing DHCP conf if any
-#
+# only lowercase for homogeneity
+$mac =~ tr/A-Z/a-z/;
 
 # newmac replaces : separator with - and only lowercase for pxelinux
@@ -46 +29 @@
 $newmac =~ s/:/-/g;
 
-my $foundit = 0;
+my $url=$ARGV[1];
 
-open(DHCPNEW,"> $dhcp.new") || die "Unable to create $dhcp.new";
-if (open(DHCP,$dhcp)) {
-    while (<DHCP>) {
-        if (/host host-$newmac \{/ .. /}\n/) {
-            # We need to replace the old content with the new one
-            print "Skip $_";
-            $foundit = 1;
-        } else {
-            print "Keep $_";
-            # Just write the existing content
-            print DHCPNEW $_;
-        }
-    }
-    close(DHCP);
-} else {
-    $foundit = 1;
+if ($url !~ /(\w+):\/\/([^\/:]+)(:\d+)?\/(.*)/) {
+    print "Syntax: dploy-add2pxe mac URL-TO-ISO\n";
+    exit(-1);
 }
 
-if ($foundit == 1) {
-    # Writes new DHCP conf from scratch
-    #
-    print DHCPNEW "\n";
-    print DHCPNEW "host host-$newmac {\n";
-    print DHCPNEW " hardware ethernet $mac;\n";
-    print DHCPNEW " fixed-address $ip;\n";
-    print DHCPNEW "}\n\n";
-}
-close(DHCPNEW);
-move("$dhcp.new",$dhcp);
-
-# Relaunch DHCP server
-system("sudo /etc/init.d/dhcpd restart");
-
-# Get the ID given by LinuxCOE to prepare kernel/initrd/ks
+# Get the ID given by LinuxCOE/MondoRescue to prepare kernel/initrd/ks
 my $iso=basename($url);
 my $id=$iso;
@@ -114 +69 @@
 copy("$mnt/isolinux/initrd.img","$pxe/../linuxcoe/$i") or die "Copy failed: $!";
 system("sudo /bin/umount $mnt");
-
-# Based on Version 2.4  27-Sep-1996  Charles Bailey  bailey@genetics.upenn.edu
-# in Basename.pm
-
-sub basename {
-
-my($fullname) = shift;
-my($dirpath,$basename);
-($dirpath,$basename) = ($fullname =~ m#^(.*/)?(.*)#s);
-
-return($basename);
-}
-