Navigation

← Previous Changeset
Next Changeset →

Changeset 2773

Timestamp:

10/30/09 09:35:18 (2 years ago)

Author:

bjorn

Message:

nonexistant -> nonexistent

Files:

trunk/ChangeLog (modified) (2 diffs)
trunk/Makefile.config (modified) (1 diff)
trunk/Makefile.config-maint (modified) (1 diff)
trunk/dists/freebsd/munin-main/files/patch-Makefile.config (modified) (1 diff)
trunk/dists/freebsd/munin-node/files/patch-Makefile.config (modified) (1 diff)
trunk/dists/redhat/Makefile.config (modified) (1 diff)
trunk/node/lib/Munin/Node/Config.pm (modified) (1 diff)
trunk/node/lib/Munin/Node/OS.pm (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/ChangeLog

r1565	r2773
157	157	* Fetch services directly after config, to make use of OS caches.
158	158	* Bugfix: .graph was ignored in some cases in munin-html, ending in
159		trying to show nonexistant graphs.
	159	trying to show nonexistent graphs.
160	160	* postfix_mailvolume: multiple fixes for problems found in sibling
161	161	exim_mailstats plugin:
…	…
475	475	* Docs: Brushed up the comments in the default munin.conf a bit (Deb#294060).
476	476	* Docs: Fixed erronous cgiurl docs (SF#1159722).
477		* Installation: Create CIGdir if nonexistant.
	477	* Installation: Create CIGdir if nonexistent.
478	478
479	479	munin (1.3.1)

trunk/Makefile.config

r2739	r2773
124	124	#
125	125	GETENT := $(shell which getent \|\| which true 2>/dev/null)
126		CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
127		CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
	126	CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
	127	CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
128	128
129	129	# For OSX, comment out the previous two lines and comment in these
130	130	#
131		#CHECKUSER := $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
132		#CHECKGROUP := $(shell nicl . -read /groups/$(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
	131	#CHECKUSER := $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
	132	#CHECKGROUP := $(shell nicl . -read /groups/$(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
133	133
134	134	# For OSX 10.5 (Leopard), use the following two lines instead of what's above
135	135	#
136		#CHECKUSER := $(shell dscl . -read /Users/$(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
137		#CHECKGROUP := $(shell dscl . -read /Groups/$(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
	136	#CHECKUSER := $(shell dscl . -read /Users/$(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
	137	#CHECKGROUP := $(shell dscl . -read /Groups/$(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
138	138
139	139
140	140	# For HP-UX, use these instead:
141	141	#
142		#CHECKUSER := $(shell pwget -n $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
143		#CHECKGROUP := $(shell grget -n $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
	142	#CHECKUSER := $(shell pwget -n $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
	143	#CHECKGROUP := $(shell grget -n $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
144	144
145	145	CHOWN := chown

trunk/Makefile.config-maint

r2739	r2773
101	101
102	102	GETENT := $(shell which getent \|\| which true 2>/dev/null)
103		CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
104		CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
	103	CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
	104	CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
105	105
106	106	CHOWN := chown

trunk/dists/freebsd/munin-main/files/patch-Makefile.config

r860	r2773
78	78	# Which command to use to check if the USER and GROUP to run Munin as, exists.
79	79	-GETENT = $(shell which getent \|\| which true 2>/dev/null)
80		-CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
81		-CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
82		+CHECKUSER:= $(shell grep $(USER) /etc/passwd >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
83		+CHECKGROUP:= $(shell grep $(GROUP) /etc/group >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
	80	-CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
	81	-CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
	82	+CHECKUSER:= $(shell grep $(USER) /etc/passwd >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
	83	+CHECKGROUP:= $(shell grep $(GROUP) /etc/group >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
84	84
85	85	CHOWN = chown

trunk/dists/freebsd/munin-node/files/patch-Makefile.config

r860	r2773
78	78	# Which command to use to check if the USER and GROUP to run Munin as, exists.
79	79	-GETENT = $(shell which getent \|\| which true 2>/dev/null)
80		-CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
81		-CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
82		+CHECKUSER:= $(shell grep $(USER) /etc/passwd >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
83		+CHECKGROUP:= $(shell grep $(GROUP) /etc/group >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
	80	-CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
	81	-CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
	82	+CHECKUSER:= $(shell grep $(USER) /etc/passwd >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
	83	+CHECKGROUP:= $(shell grep $(GROUP) /etc/group >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
84	84
85	85	CHOWN = chown

trunk/dists/redhat/Makefile.config

r2213	r2773
26	26	PLUGINUSER = nobody
27	27	GETENT = $(shell which getent \|\| which true 2>/dev/null)
28		CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
29		CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
	28	CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
	29	CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
30	30
31	31	DOCDIR = $(PREFIX)/share/doc/munin-$(VERSION)

trunk/node/lib/Munin/Node/Config.pm

r2672	r2773
274	274
275	275	if (!defined $gid && $is_optional) {
276		carp "DEBUG: Skipping optional nonexistant group '$group'"
	276	carp "DEBUG: Skipping optional nonexistent group '$group'"
277	277	if $self->{DEBUG};
278	278	next;

trunk/node/lib/Munin/Node/OS.pm

r2431	r2773
65	65
66	66	unless (-e "$target") {
67		warn "Failed to check permissions on nonexistant target: '$target'";
	67	warn "Failed to check permissions on nonexistent target: '$target'";
68	68	return;
69	69	}

Navigation

Changeset 2773

Legend:

Download in other formats: