Changeset 65 for devel/dploy-pxe/bin/dploy-pxe-post

Timestamp:

08/05/08 17:37:18 (4 years ago)

Author:

bruno

Message:

• Use of PBTMP
• Use of PBPROJ only once at begining, then a var. Avoids expansions which are not wanted.
• Use pb 0.9.3 syntx
• Fix substitution error in tftpd (/e flag needed for evaluation)
• Fix management of temp file for tftpd

File:

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

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

@@ -49 +49 @@
 =cut
 
+my $proj = "PBPROJ";
+
+pb_conf_init($proj);
+pb_temp_init();
 pb_syntax_init("dploy-pxe-post\n");
 
@@ -54 +58 @@
 
 # Get dploy account info
-my $user = "PBPROJ";
+my $user = $proj;
 my ($login,$pass,$uid,$gid,$gecos,$dir,$shell) = getpwnam($user) or die "$user not in passwd file";
 
@@ -61 +65 @@
 open(SUDO,"/etc/sudoers") || die "Unable to read /etc/sudoers";
 while (<SUDO>) {
-    $found = 1 if ((/^PBPROJ/) && (/\/bin\/umount/));
+    $found = 1 if ((/^$proj/) && (/\/bin\/umount/));
 }
 close(SUDO);
@@ -67 +71 @@
 if ($found == 0) {
     open(SUDO,">> /etc/sudoers") || die "Unable to write /etc/sudoers";
-    print SUDO "PBPROJ ALL=NOPASSWD: /bin/mount -o loop ?*\n";
-    print SUDO "PBPROJ ALL=NOPASSWD: /bin/umount ?*\n";
+    print SUDO "$proj ALL=NOPASSWD: /bin/mount -o loop ?*\n";
+    print SUDO "$proj ALL=NOPASSWD: /bin/umount ?*\n";
     close(SUDO);
 }
@@ -76 +80 @@
 
 # Create dir structure
-foreach $d ("$pathpxe->{$ENV{'PBPROJ'}}", "$pathpxe->{$ENV{'PBPROJ'}}/../linuxcoe", "$pathpxe->{$ENV{'PBPROJ'}}/../mondorescue") {
+foreach my $d ("$pathpxe->{$proj}", "$pathpxe->{$proj}/../linuxcoe", "$pathpxe->{$proj}/../mondorescue") {
     pb_mkdir_p($d) if ( not -d $d);
     chown $uid,$gid,$d;
@@ -88 +92 @@
 
 open(XIN,$xin)  || die "Unable to read $xin: $!";
-open(OUT,"$xin.tmp")  || die "Unable to write $xin.tmp: $!";
+open(OUT,"> $ENV{'PBTMP'}/tftpd")  || die "Unable to write $ENV{'PBTMP'}/tftpd: $!";
 while (<XIN>) {
     s/disable(\s*)=(\s*)yes/disable$1=$2no/;
-    s/server_args(\s*)=(\s*)(.*)/change_parms($1,$2,$3)/;
+    s/server_args(\s*)=(\s*)(.*)/change_parms($1,$2,$3)/e;
     print OUT;
 }
 close(XIN);
 close(OUT);
-move("$xin.tmp",$xin);
+move("$ENV{'PBTMP'}/tftpd",$xin);
 
 # Restart xinetd
@@ -112 +116 @@
     print "# Modified by dploy.org\n";
     print "# server_args$s1=$s2$params\n";
-    my $dir = dirname($pathpxe->{$ENV{'PBPROJ'}});
+    my $dir = dirname($pathpxe->{$proj});
     $params =~ s/-s\s+\S+\s+/-s $dir/;
     print "server_args$s1=$s2$params\n";
-$xin)}
+}