From 9d92820a291293378e4899397ea5e234b8603224 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Wed, 9 Jan 2013 16:59:08 +0000
Subject: More fun with pkg-install.

svn path=/branches/tk377/; revision=4962
---
 rcynic/installation-scripts/freebsd/rc.d.rcynic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rcynic/installation-scripts/freebsd/rc.d.rcynic')

diff --git a/rcynic/installation-scripts/freebsd/rc.d.rcynic b/rcynic/installation-scripts/freebsd/rc.d.rcynic
index 73e6efda..69c97ce6 100755
--- a/rcynic/installation-scripts/freebsd/rc.d.rcynic
+++ b/rcynic/installation-scripts/freebsd/rc.d.rcynic
@@ -12,7 +12,7 @@ name="rcynic"
 start_cmd="rcynic_start"
 stop_cmd="rcynic_stop"
 
-: ${rcynic_jaildir="/var/rcynic"}
+: ${rcynic_jaildir="/usr/local/var/rcynic"}
 : ${rcynic_user="rcynic"}
 : ${rcynic_group="rcynic"}
 
-- 
cgit v1.2.3


From ddc122bdff0591ad350a985beed14cdde6a8fd73 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Sat, 12 Jan 2013 01:50:45 +0000
Subject: Using @cwd in FreeBSD pkg-plist seems to work, and is much less of a
 change from what has until now been standard practice, so going with that.

svn path=/branches/tk377/; revision=4967
---
 rcynic/installation-scripts/freebsd/rc.d.rcynic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rcynic/installation-scripts/freebsd/rc.d.rcynic')

diff --git a/rcynic/installation-scripts/freebsd/rc.d.rcynic b/rcynic/installation-scripts/freebsd/rc.d.rcynic
index 69c97ce6..73e6efda 100755
--- a/rcynic/installation-scripts/freebsd/rc.d.rcynic
+++ b/rcynic/installation-scripts/freebsd/rc.d.rcynic
@@ -12,7 +12,7 @@ name="rcynic"
 start_cmd="rcynic_start"
 stop_cmd="rcynic_stop"
 
-: ${rcynic_jaildir="/usr/local/var/rcynic"}
+: ${rcynic_jaildir="/var/rcynic"}
 : ${rcynic_user="rcynic"}
 : ${rcynic_group="rcynic"}
 
-- 
cgit v1.2.3


From 27d85628a8ebe96c3adc2dbeac0e58160c727071 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Fri, 1 Feb 2013 18:38:48 +0000
Subject: Checkpoint

svn path=/branches/tk377/; revision=5001
---
 rcynic/installation-scripts/freebsd/rc.d.rcynic | 76 -------------------------
 1 file changed, 76 deletions(-)
 delete mode 100755 rcynic/installation-scripts/freebsd/rc.d.rcynic

(limited to 'rcynic/installation-scripts/freebsd/rc.d.rcynic')

diff --git a/rcynic/installation-scripts/freebsd/rc.d.rcynic b/rcynic/installation-scripts/freebsd/rc.d.rcynic
deleted file mode 100755
index 73e6efda..00000000
--- a/rcynic/installation-scripts/freebsd/rc.d.rcynic
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh -
-#
-# $Id$
-#
-# PROVIDE: rcynic
-# REQUIRE: DAEMON
-# KEYWORD: nojail
-
-. /etc/rc.subr
-
-name="rcynic"
-start_cmd="rcynic_start"
-stop_cmd="rcynic_stop"
-
-: ${rcynic_jaildir="/var/rcynic"}
-: ${rcynic_user="rcynic"}
-: ${rcynic_group="rcynic"}
-
-rcynic_start()
-{
-	/bin/test -d "${rcynic_jaildir}" || /bin/mkdir "${rcynic_jaildir}"
-	/sbin/umount "${rcynic_jaildir}/dev" 2>/dev/null
-
-	/usr/sbin/mtree -deU -p "${rcynic_jaildir}" <<EOF
-
-		/set type=dir uname=root gname=wheel mode=0555
-		.
-			bin
-			..
-			dev
-			..
-			etc
-				trust-anchors
-				..
-			..
-			var
-				run
-				..
-			..
-			data	uname=${rcynic_user} gname=${rcynic_group} mode=0755
-			..
-		..
-EOF
-
-	/bin/chmod -R a-w "${rcynic_jaildir}/bin" "${rcynic_jaildir}/etc"
-	/usr/sbin/chown -R root:wheel "${rcynic_jaildir}/bin" "${rcynic_jaildir}/etc"
-
-	if /bin/test -f "${rcynic_jaildir}/etc/rsa_key"; then
-		/bin/chmod 400 "${rcynic_jaildir}/etc/rsa_key"
-		/usr/sbin/chown "${rcynic_user}" "${rcynic_jaildir}/etc/rsa_key"
-	fi
-
-	if ! /sbin/mount -t devfs dev "${rcynic_jaildir}/dev"; then
-		echo "Mounting devfs on ${rcynic_jaildir}/dev failed..."
-		exit 1
-	fi
-
-	/sbin/devfs -m "${rcynic_jaildir}/dev" rule apply hide
-	/sbin/devfs -m "${rcynic_jaildir}/dev" rule apply path null unhide
-	/sbin/devfs -m "${rcynic_jaildir}/dev" rule apply path random unhide
-
-	for i in /etc/localtime /etc/resolv.conf; do
-		j="${rcynic_jaildir}${i}"
-		if /bin/test -r "$i" && ! /usr/bin/cmp -s "$i" "$j"; then
-			/usr/bin/install -m 444 -o root -g wheel -p "$i" "$j"
-		fi
-	done
-}
-
-rcynic_stop()
-{
-	/sbin/umount "${rcynic_jaildir}/dev" 2>/dev/null
-}
-
-load_rc_config $name
-run_rc_command "$1"
-- 
cgit v1.2.3