Changeset 69 for devel/dploy-pxe

Timestamp:

08/05/08 18:22:35 (4 years ago)

Author:

bruno

Message:

change_parms is now returning a string so that it works in the s/e and does the right job for string substitution hopefully

File:

• devel/dploy-pxe/bin/dploy-pxe-post (modified) (2 diffs)

devel/dploy-pxe/bin/dploy-pxe-post

@@ -48 +48 @@
 
 =cut
+
+=over 4
+
+change_parms is an internal function which changes the base default dir of the 
+tftp server with the one we want for dploy.
+
+=cut
+
+sub change_parms() {
+    
+    my ($s1, $s2, $params) = @_;
+    my $ret = "\n";
+
+    $ret .= "### Modified by dploy.org\n";
+    $ret .= "### original: server_args$s1=$s2$params\n";
+    my $dir = dirname($pathpxe->{$proj});
+    my $nparams = $params;
+    $nparams =~ s/-s\s+\S+/-s $dir/;
+    $ret .= "server_args$s1=$s2$nparams\n";
+    print "Changing tftpd args from $parms to $nparams\n";
+    return($ret);
+}
+
 
 my $proj = "PBPROJ";
@@ -110 +133 @@
 # PBHTTPDCONFDIR
 # Prepare Apache conf for kickstart support for LinuxCOE
-
-sub change_parms() {
-    
-    my ($s1, $s2, $params) = @_;
-    print "# Modified by dploy.org\n";
-    print "# server_args$s1=$s2$params\n";
-    my $dir = dirname($pathpxe->{$proj});
-    $params =~ s/-s\s+\S+\s+/-s $dir/;
-    print "server_args$s1=$s2$params\n";
-}