Date: Mon, 26 Feb 2007 14:29:28 +0900 (YAKT) From: Alexander Logvinov <ports@logvinov.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: bu7cher@yandex.ru Subject: ports/109546: [PATCH] devel/cvsd: fix startup error when chroot jail is not in use Message-ID: <200702260529.l1Q5TS08079868@blg.akavia.ru> Resent-Message-ID: <200702260530.l1Q5U7Fj043094@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 109546
>Category: ports
>Synopsis: [PATCH] devel/cvsd: fix startup error when chroot jail is not in use
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Feb 26 05:30:06 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Alexander Logvinov
>Release: FreeBSD 6.2-RELEASE-p1
>Organization:
>Environment:
>Description:
We can find folowing instructions in cvsd.conf.sample:
# RootJail <path>
# This is the location of the chroot jail
# cvs should be run in.
# Specify 'none' (without quotes) to not use
# a chroot jail.
But when RootJail is set to 'none' there is some errors on starting
rc_subr script and cvsd doesn't start.
>How-To-Repeat:
Set RootJail to 'none' in the cvsd.conf.
Start cvsd without cvsd-buildroot execution.
# /usr/local/etc/rc.d/cvsd start
mount: /none: No such file or directory
devfs: open: none/dev: No such file or directory
devfs: open: none/dev: No such file or directory
devfs: open: none/dev: No such file or directory
# /usr/local/etc/rc.d/cvsd stop
cvsd not running?
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/cvsd/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- Makefile 29 Jan 2007 19:05:03 -0000 1.42
+++ Makefile 26 Feb 2007 05:27:28 -0000
@@ -8,6 +8,7 @@
PORTNAME= cvsd
PORTVERSION= 1.0.13
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://ch.tudelft.nl/~arthur/cvsd/
Index: files/cvsd.in
===================================================================
RCS file: /home/ncvs/ports/devel/cvsd/files/cvsd.in,v
retrieving revision 1.1
diff -u -r1.1 cvsd.in
--- files/cvsd.in 8 Jun 2006 16:59:41 -0000 1.1
+++ files/cvsd.in 26 Feb 2007 05:27:28 -0000
@@ -35,7 +35,7 @@
cvsd_prestart()
{
cvsd_config
- if [ $osreldate -gt 500000 ]; then
+ if [ $osreldate -gt 500000 ] && [ "$chrootjail" != "none" ]; then
mount -t devfs devfs $chrootjail/dev
devfs -m $chrootjail/dev rule apply hide
devfs -m $chrootjail/dev rule apply path null unhide
@@ -46,7 +46,7 @@
cvsd_poststop()
{
- if [ $osreldate -gt 500000 ]; then
+ if [ $osreldate -gt 500000 ] && [ "$chrootjail" != "none" ]; then
umount -t devfs $chrootjail/dev
fi
}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702260529.l1Q5TS08079868>