Attachment #234420 for bug #264425

Lines 1-7 Link Here

(-)b/sysutils/nomad/Makefile (-1 / +1 lines)
1	PORTNAME= nomad	1	PORTNAME= nomad
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 1.2.6	3	DISTVERSION= 1.2.6
4	PORTREVISION= 1	4	PORTREVISION= 2
5	CATEGORIES= sysutils	5	CATEGORIES= sysutils
6		6
7	MAINTAINER= jhixson@FreeBSD.org	7	MAINTAINER= jhixson@FreeBSD.org




		install -o ${nomad_user} -g ${nomad_group} /dev/null ${pidfile};
	fi

	if [ ! -d "${nomad_dir}" ]; then
		install -d -o ${nomad_user} -g ${nomad_group} "${nomad_dir}"
		chmod 0700 "${nomad_dir}"
	fi

	if [ "${nomad_debug}" != "NO" ]; then
		command_args="-T ${name} ${command_args}"
	fi

	if [ "$(stat -f "%Lp" "${nomad_dir}")" -ne "700" ]; then
		2>&1 echo "Error: File permissions of ${nomad_dir} must be 700, not starting."
		exit 1
	fi
}

run_rc_command "$1"




[
{ type: upgrade,
  message: <<EOM
The nomad rc script requires the nomad data directory (as configured
in the rc variable `nomad_dir`) to use strict directory permissions.

If your nomad data directory was created automatically using a
previous version of the package, it is likely that its permissions
are too lax. If that is the case, nomad will refuse to start with
an error message and the situation can be resolved by adjusting
directory permissions manually by issuing the chmod command,
e.g. `chmod 700 /var/tmp/nomad`.
EOM
}
]

Return to bug 264425

Lines 49-60 nomad_startprecmd() Link Here

(-)b/sysutils/nomad/files/nomad.in (-2 / +9 lines)
49	install -o ${nomad_user} -g ${nomad_group} /dev/null ${pidfile};	49	install -o ${nomad_user} -g ${nomad_group} /dev/null ${pidfile};
50	fi	50	fi
51		51
52	if [ ! -d ${nomad_dir} ]; then	52	if [ ! -d "${nomad_dir}" ]; then
53	install -d -o ${nomad_user} -g ${nomad_group} ${nomad_dir}	53	install -d -o ${nomad_user} -g ${nomad_group} "${nomad_dir}"
		54	chmod 0700 "${nomad_dir}"
54	fi	55	fi
		56
55	if [ "${nomad_debug}" != "NO" ]; then	57	if [ "${nomad_debug}" != "NO" ]; then
56	command_args="-T ${name} ${command_args}"	58	command_args="-T ${name} ${command_args}"
57	fi	59	fi
		60
		61	if [ "$(stat -f "%Lp" "${nomad_dir}")" -ne "700" ]; then
		62	2>&1 echo "Error: File permissions of ${nomad_dir} must be 700, not starting."
		63	exit 1
		64	fi
58	}	65	}
59		66
60	run_rc_command "$1"	67	run_rc_command "$1"

Added Link Here

(-)b/sysutils/nomad/pkg-message (-1 / +15 lines)
0	-	1	[
		2	{ type: upgrade,
		3	message: <<EOM
		4	The nomad rc script requires the nomad data directory (as configured
		5	in the rc variable `nomad_dir`) to use strict directory permissions.
		6
		7	If your nomad data directory was created automatically using a
		8	previous version of the package, it is likely that its permissions
		9	are too lax. If that is the case, nomad will refuse to start with
		10	an error message and the situation can be resolved by adjusting
		11	directory permissions manually by issuing the chmod command,
		12	e.g. `chmod 700 /var/tmp/nomad`.
		13	EOM
		14	}
		15	]