diff --git a/xCAT-client/pods/man1/rcons.1.pod b/xCAT-client/pods/man1/rcons.1.pod index 8306ec092..918d53735 100644 --- a/xCAT-client/pods/man1/rcons.1.pod +++ b/xCAT-client/pods/man1/rcons.1.pod @@ -47,7 +47,7 @@ Print version. =head1 B B table - -xCAT node hardware management table. See B for +xCAT node hardware management table. See L for further details. This is used to determine the console access method. diff --git a/xCAT-client/pods/man1/rmigrate.1.pod b/xCAT-client/pods/man1/rmigrate.1.pod index 3eedaceca..3ea120285 100644 --- a/xCAT-client/pods/man1/rmigrate.1.pod +++ b/xCAT-client/pods/man1/rmigrate.1.pod @@ -13,7 +13,7 @@ B requests that a guest VM be moved from the current entity hosting it =head1 B B table - -Table governing VM paramaters. See B for further details. +Table governing VM paramaters. See L for further details. This is used to determine the current host to migrate from. =head1 B diff --git a/xCAT-client/pods/man1/rspreset.1.pod b/xCAT-client/pods/man1/rspreset.1.pod index b73071991..a29bf4f83 100644 --- a/xCAT-client/pods/man1/rspreset.1.pod +++ b/xCAT-client/pods/man1/rspreset.1.pod @@ -45,4 +45,4 @@ Reset the service processor that controls node5: =head1 B -L, nodehm(5) +L, L diff --git a/xCAT-client/pods/man1/wcons.1.pod b/xCAT-client/pods/man1/wcons.1.pod index 664c5c534..6a3de839d 100644 --- a/xCAT-client/pods/man1/wcons.1.pod +++ b/xCAT-client/pods/man1/wcons.1.pod @@ -48,7 +48,7 @@ specified). =head1 B B table - -xCAT node hardware management table. See B for further details. This is used to determine the console access +xCAT node hardware management table. See L for further details. This is used to determine the console access method. =head1 B diff --git a/xCAT-client/pods/man8/copycds.8.pod b/xCAT-client/pods/man8/copycds.8.pod index df2c1994a..1b63ed7b0 100644 --- a/xCAT-client/pods/man8/copycds.8.pod +++ b/xCAT-client/pods/man8/copycds.8.pod @@ -61,4 +61,4 @@ B =head1 SEE ALSO -L, site(5), nodetype(5) +L, L, L diff --git a/xCAT-client/pods/man8/makehosts.8.pod b/xCAT-client/pods/man8/makehosts.8.pod index f7cd5de0a..563d817b7 100644 --- a/xCAT-client/pods/man8/makehosts.8.pod +++ b/xCAT-client/pods/man8/makehosts.8.pod @@ -56,4 +56,4 @@ IP addresses of 1.2.3.1, 1.2.3.2, etc. =head1 SEE ALSO -hosts(5), L +L, L diff --git a/xCAT-client/pods/man8/nodeset.8.pod b/xCAT-client/pods/man8/nodeset.8.pod index 968d8f958..4e9ee02e2 100644 --- a/xCAT-client/pods/man8/nodeset.8.pod +++ b/xCAT-client/pods/man8/nodeset.8.pod @@ -19,7 +19,7 @@ take next. B will maniputale the boot configuration files of yaboot and pxelinux.0. -Assume that /tftpboot is the root for tftpd (set in B). +Assume that /tftpboot is the root for tftpd (set in L). B for pxe makes changes to /tftpboot/pxelinux.cfg/{node hex ip} @@ -87,16 +87,16 @@ Print version. =head1 B B table - -xCAT node resources file. See B for further +xCAT node resources file. See L for further details. B table - -xCAT node installation type file. See B for fur- +xCAT node installation type file. See L for fur- ther details. This is used to determine the node installation image type. B table - -xCAT main configuration file. See B for further +xCAT main configuration file. See L for further details. This is used to determine the location of the TFTP root directory and the TFTP xCAT subdirectory. /tftpboot and /tftpboot/xcat is the default. @@ -113,5 +113,5 @@ resource group. =head1 B B -L, L, L, L, -L +L, L, L, L, +L, L diff --git a/xCAT-client/xpod2man b/xCAT-client/xpod2man index 639ff78c9..d4c2399af 100755 --- a/xCAT-client/xpod2man +++ b/xCAT-client/xpod2man @@ -58,6 +58,7 @@ foreach my $podfile (@pods) { # Remove the dummy pods unlink @dummyPods; +rmdir "$poddir/man7"; exit; @@ -68,7 +69,7 @@ exit; # keep track of all dummy pods created, so they can be removed later sub createDummyPods { my ($poddir, $pods) = @_; - my $cmd = "grep -r -E 'L<.+\\(5\\)\\|.+\\.5>' " . $poddir; + my $cmd = "grep -r -E 'L<.+\\([57]\\)\\|.+\\.[57]>' " . $poddir; #print "Running cmd: ", $cmd, "\n"; my @lines = `$cmd`; if ($?) { print "Error running: $cmd\n"; print join('', @lines); } @@ -77,11 +78,16 @@ sub createDummyPods { my @dummyPods; foreach my $l (@lines) { #print "$l\n"; - my @matches = $l =~ /L<([^\(]+)\(5\)\|\1\.5>/g; # get all the matches in the line - foreach my $m (@matches) { - my $filename = "$poddir/man5/$m.5.pod"; + my @matches = $l =~ /L<([^\(]+)\(([57])\)\|\1\.[57]>/g; # get all the matches in the line + # The above line should create the array with every other entry being the man page name + # and every other entry is the section # (5 or 7) + my $cmd; + while ($cmd=shift @matches) { + #foreach my $m (@matches) { + my $section = shift @matches; + my $filename = "$poddir/man$section/$cmd.$section.pod"; #print "$filename\n"; - if (!(grep /^$filename$/, @$pods)) { push @dummyPods, $filename; } + if (!(grep /^$filename$/, @$pods) && !(grep /^$filename$/, @dummyPods)) { push @dummyPods, $filename; } } } @@ -90,8 +96,9 @@ sub createDummyPods { # Create these empty files print "Creating empty linked-to files: ", join(', ', @dummyPods), "\n"; + mkdir "$poddir/man7"; foreach my $d (@dummyPods) { - if (!open(TMP, ">>$d")) { warn "Could not creaate dummy pod file $d ($!)\n"; } + if (!open(TMP, ">>$d")) { warn "Could not create dummy pod file $d ($!)\n"; } else { close TMP; } } @@ -142,7 +149,7 @@ OS diskful/diskfree deployment. =head1 XCAT DATABASE -All of the cluster configuration information is in the xCAT database. See B for +All of the cluster configuration information is in the xCAT database. See L for descriptions of every table in the database. =head1 XCAT COMMANDS @@ -190,7 +197,7 @@ sub convertpod2html { #TODO: use --css= and --title= to make the pages look better pod2html($podfile, "--outfile=$htmlfile", - "--podpath=man1:man3:man5:man8", + "--podpath=man1:man3:man5:man7:man8", "--podroot=$poddir", "--htmldir=$htmldir", "--recurse",