Changeset 7 for devel/dploy

Timestamp:

05/10/07 19:22:32 (5 years ago)

Author:

bruno

Message:

Updated version of add2pxe working in very limited conf, but working

File:

• devel/dploy/bin/add2pxe (modified) (6 diffs)

devel/dploy/bin/add2pxe

@@ -5 +5 @@
 
 my $dhcp="/etc/dhcpd.d/linuxcoe.conf";
+#
+# /etc/dhcpd.conf should include that line:
+# include "/etc/dhcpd.d/linuxcoe.conf";
+# as part of the appropriate range
+# does not support multiple ranges yet
+#
 my $pxe="/tftpboot/pxelinux.cfg";
+# Where to find the LinuxCOE created ISO
 my $linuxcoe="/var/ftp/html/scratch_monkey/systemdesigner";
+# temporary mountpoint
 my $mnt="/tmp/mnt-linuxcoe";
-my $dhcpcnt;
 
 my $mac=$ARGV[0];
 
-if ($mac !~ /:/) {
-    print "Syntax: add2pxe mac ip URL-to-LinuxCOE-ISO\n";
+if ($mac !~ /^(?:[[:xdigit:]]{1,2}[-:]){5}[[:xdigit:]]{1,2}$/) {
+    print "Syntax: add2pxe MAC ip url-to-LinuxCOE-iso\n";
     exit(-1);
 }
@@ -19 +26 @@
 my $ip=$ARGV[1];
 
-if ($ip !~ /\./) {
-    print "Syntax: add2pxe mac ip URL-to-LinuxCOE-ISO\n";
+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);
 }
@@ -26 +33 @@
 my $url=$ARGV[2];
 
-if ($url !~ /:/) {
-    print "Syntax: add2pxe mac ip URL-to-LinuxCOE-ISO\n";
+if ($url !~ /(\w+):\/\/([^\/:]+)(:\d+)?\/(.*)/) {
+    print "Syntax: add2pxe mac ip URL-TO-LinuxCOE-ISO\n";
     exit(-1);
 }
@@ -33 +40 @@
 # Reads existing DHCP conf if any
 #
-if (! open(DHCP,$dhcp)) {
-    # Doesn't exist yet => no content
-    $dhcpcnt = "";
-} else {
-    # reads dhcp content
-    $/ = '\0';
-    $dhcpcnt = <DHCP>;
-    $/ = '\n';
-}
-close(DHCP);
 
-# Writes new DHCP conf
-#
+# newmac replaces : separator with - and only lowercase for pxelinux
 my $newmac = $mac;
 $newmac =~ tr/A-Z/a-z/;
 $newmac =~ s/:/-/g;
-open(DHCP, "> $dhcp") || die "Unable to open $dhcp for writing";
-print DHCP "$dhcpcnt";
-print DHCP "host host-$newmac {\n";
-print DHCP "    hardware ethernet $mac;\n";
-print DHCP "    fixed-address $ip;\n";
-print DHCP "}\n";
-close(DHCP);
+
+my $foundit = 0;
+
+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 ($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");
 
-# mount the ISO to get kernel and initrd
+# Get the ID given by LinuxCOE to prepare kernel/initrd/ks
 my $iso=basename($url);
 my $id=$iso;
@@ -68 +89 @@
 my $ks=$url;
 $ks =~ s/img([0-9]+)\.iso/ks$1.cfg/;
-mkdir "$mnt",0755;
-system("sudo /bin/mount -o loop $linuxcoe/$iso $mnt");
-copy("$mnt/isolinux/vmlinuz","$pxe/../linuxcoe/$k") or die "Copy failed: $!";
-copy("$mnt/isolinux/initrd.img","$pxe/../linuxcoe/$i") or die "Copy failed: $!";
-system("sudo /bin/umount $mnt");
 
 # Updates PXElinux
@@ -92 +108 @@
 close(PXE);
 
+# mount the ISO to get kernel and initrd
+mkdir "$mnt",0755;
+system("sudo /bin/mount -o loop $linuxcoe/$iso $mnt");
+copy("$mnt/isolinux/vmlinuz","$pxe/../linuxcoe/$k") or die "Copy failed: $!";
+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