Changeset 51 for devel/dploy-pxe

Timestamp:

05/02/08 16:00:33 (4 years ago)

Author:

bruno

Message:

• Use pb functions in scripts
• Update of concept doc
• Check errors in dploy-add2dhcp

File:

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

devel/dploy-pxe/bin/dploy-add2pxe

@@ -18 +18 @@
 my $ksdevice = "eth0";
 my $prefix = undef;
-my $mrserver = undef;
-my $mrpath = undef;
 
 GetOptions("help|?|h" => \$opts{'h'},
@@ -35 +33 @@
 
 # temporary mountpoint
-if (not defined $ENV {'TMPDIR'}) {
-    $ENV{'TMPDIR'} = "/tmp";
-}
-my $tmp=tempdir("dploy.XXXXXXXXXX", DIR => $ENV{'TMPDIR'}, CLEANUP => 1);
-my $mnt="$tmp/iso";
-my $mnt2="$tmp/nfs";
+pb_temp_init();
+my $mnt="$ENV{'PBTMP'}/iso";
+my $mnt2="$ENV{'PBTMP'}/nfs";
 
 # Check Mac consitency 
 my $mac = dploy_check_mac($opt{'mac'});
 
-# Check URL syntax
-if (defined $opts{'url'}) {
-    $url = $opts{'url'};
-}
-
-if ($url !~ /(\w+):\/\/([^\/:]+)(:\d+)?\/(.*)/) {
-    print "Syntax: dploy-add2pxe mac URL-TO-ISO\n";
-    exit(-1);
-}
-
-# Get Mondorescue values
-$mrserver = dploy_get_url();
-$mrpath = dploy_get_url();
+my ($scheme, $account, $mrserver, $port, $mrpath) = pb_get_uri($opts{'url'});
 
 # Get the ID given by LinuxCOE/MondoRescue to prepare kernel/initrd/ks
@@ -71 +54 @@
 mkdir "$mnt",0755;
 if ($opt{'type'} == "LinuxCOE") {
-    pb_system("sudo /bin/mount -o loop $linuxcoe/$iso $mnt","Error mounting $linuxcoe/$iso");
+    pb_system("sudo /bin/mount -o loop $linuxcoe/$iso $mnt","Mounting $linuxcoe/$iso");
 } else if ($opt{'type'} == "MondoRescue") {
-    pb_system("sudo /bin/mount -t nfs $mrserver:$mrpath $mnt2","Error mountig NFS $mrserver:$mrpath");
-    pb_system("sudo /bin/mount -o loop $mnt2/$prefix-1.iso $mnt","Error mounting LOOP $mnt2/$prefix-1.iso");
+    pb_system("sudo /bin/mount -t nfs $mrserver:$mrpath $mnt2","Mountig NFS $mrserver:$mrpath");
+    pb_system("sudo /bin/mount -o loop $mnt2/$prefix-1.iso $mnt","Mounting LOOP $mnt2/$prefix-1.iso");
 } else {
     # Type passed has parameter does not contain a valid value
@@ -85 +68 @@
 
 # Get the Command Line parameters for MondoRescue restoration
+my $cliparams;
 open(ISOLINUX, "$mnt/isolinux.cfg") || die "Unable to open $mnt/isolinux.cfg for writing";
 while ( <ISOLINUX> ) {
     if (/label nuke/) {
-        my $cliparams = <ISOLINUX>;     # kernel line
+        $cliparams = <ISOLINUX>;        # kernel line
         $cliparams = <ISOLINUX>;        # append line
     }
@@ -96 +80 @@
 close ISOLINUX;
 # All done with ISO image... umounting
-pb_system("sudo /bin/umount $mnt","Error umount ISO image);
+pb_system("sudo /bin/umount $mnt","Umount ISO image");
 
 # Updates PXElinux