File: 01_rancid_par.patch

package info (click to toggle)
rancid 3.14-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid, trixie
  • size: 3,436 kB
  • sloc: sh: 2,627; ansic: 1,683; makefile: 390; exp: 185
file content (139 lines) | stat: -rw-r--r-- 3,862 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
Author: Roland Rosenfeld <roland@debian.org>
Description: Moves par(1) to rancid_par(1), compare #163074
Bug-Debian: https://bugs.debian.org/163074
Forwarded: not-needed

--- a/bin/control_rancid.in
+++ b/bin/control_rancid.in
@@ -191,7 +191,7 @@ if [ -z "$commitmsg" ] ; then
     export commitmsg
 fi
 
-# Number of things par should run in parallel.
+# Number of things rancid_par should run in parallel.
 PAR_COUNT=${PAR_COUNT:-5}
 # Number of times failed collections should be retried.  Minimum 0.
 MAX_ROUNDS=${MAX_ROUNDS:-4}
@@ -568,7 +568,7 @@ cd $DIR/configs
 # tailored to the specific installation.
 echo ""
 echo "Trying to get all of the configs."
-par -q -n $PAR_COUNT -c 'rancid-fe "{}"' $devlistfile
+rancid_par -q -n $PAR_COUNT -c 'rancid-fe "{}"' $devlistfile
 
 # This section will generate a list of missed routers
 # and try to grab them again.  It will run through
@@ -598,7 +598,7 @@ do
     if [ -f $DIR/routers.up.missed ] ; then
 	echo "====================================="
 	echo "Getting missed routers: round $round."
-	par -q -n $PAR_COUNT -c 'rancid-fe "{}"' $DIR/routers.up.missed
+	rancid_par -q -n $PAR_COUNT -c 'rancid-fe "{}"' $DIR/routers.up.missed
 	rm -f $DIR/routers.up.missed
 	round=`expr $round + 1`
     else
--- a/man/par.1
+++ b/man/par.1
@@ -1,10 +1,10 @@
 .\"
 .hys 50
-.TH "par" "1" "29 July 2019"
+.TH "rancid_par" "1" "29 July 2019"
 .SH NAME
-par \- parallel command processing
+rancid_par \- parallel command processing
 .SH SYNOPSIS
-.B par
+.B rancid_par
 [\fB\-FHdefiqx\fP]
 [\c
 .BI \-c\ 
@@ -20,7 +20,7 @@ logfile]
  #]
 [file [file...]]
 .SH DESCRIPTION
-.B par
+.B rancid_par
 takes a list of files to run a command on.  The first line of each file begins
 with a colon (:) or a pound-sign (#).  If a colon, the remainder of the
 line is a command to run for each of the subsequent lines.  If a pound-sign,
@@ -49,10 +49,10 @@ For example, an inputfile whose contents
 	c
 .sp
 run with
-.B par
+.B rancid_par
 like so:
 .sp
-	%par -q inputfile
+	%rancid_par -q inputfile
 .sp
 will produce the following output (order will vary):
 .sp
@@ -105,7 +105,7 @@ processes.
 .TP
 .B \-l
 Prefix of logfile name, as in prefix.N where N is the
-.B par
+.B rancid_par
 process number ([0..]).
 .sp
 Default: par.log.<time>.[0..]
@@ -124,7 +124,7 @@ Pause N seconds between running commands
 .B \-q
 Quiet mode.  Omit the typical processing logs and do not create the log files
 from -l, instead the children inherit stdout and stderr from
-.B par.
+.B rancid_par.
 .B \-q
 is mutually exclusive with the
 .B \-x
@@ -134,7 +134,7 @@ options and the option appearing last wi
 .\"
 .TP
 .B \-x
-View par logs in real-time via an 
+View rancid_par logs in real-time via an
 .BR xterm (1).
 .El
 .SH FILES
@@ -143,24 +143,24 @@ View par logs in real-time via an
 .\" set tabstop to longest possible filename, plus a wee bit
 .ta \w'par.log.1006028679.00  'u
 \fIpar.log.T.N\fR Log file; where T is the current time in seconds since the
-epoch and N is the par process number ([0..]).
+epoch and N is the rancid_par process number ([0..]).
 .\"
 .SH "HISTORY"
-.B par
+.B rancid_par
 was ported from the perl version.
 It differs in the following manner:
 .sp
 .TP
 A)
 If
-.B par
+.B rancid_par
 receives a HUP/INT/TERM/QUIT signal, it does not print the commands that
 will not be run.
 .sp
 .TP
 B)
 If
-.B par
+.B rancid_par
 received a HUP/INT/TERM/QUIT signal, it does not exit immediately after
 sending kill to running jobs.  it waits for them to exit so that they are
 cleaned-up properly.
--- a/man/rancid.conf.5.in
+++ b/man/rancid.conf.5.in
@@ -251,7 +251,7 @@ Default: 24
 .TP
 .B PAR_COUNT
 Defines the number of rancid processes that
-.IR par (1)
+.IR rancid_par (1)
 will start simultaneously as
 .IR control_rancid (1)
 attempts to perform collections.  Raising this value will decrease the amount