ruben/ezjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Farewell CVS for ports. ezjail_portscvsroot is gone.

Browse Source
This commit is contained in:
erdgeist 2013-04-11 16:37:20 +00:00
parent c8694ac703
commit 712a4cdb54
3 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ezjail-admin
View File

@ -20,7 +20,6 @@ ezjail_jailcfgs="${ezjail_etc}/ezjail"
: ${ezjail_jailtemp="${ezjail_jaildir}/ezjailtemp"} : ${ezjail_jailtemp="${ezjail_jaildir}/ezjailtemp"}
: ${ezjail_flavours_dir="${ezjail_jaildir}/flavours"} : ${ezjail_flavours_dir="${ezjail_jaildir}/flavours"}
: ${ezjail_archivedir="${ezjail_jaildir}/ezjail_archives"} : ${ezjail_archivedir="${ezjail_jaildir}/ezjail_archives"}
: ${ezjail_portscvsroot="freebsdanoncvs@anoncvs.FreeBSD.org:/home/ncvs"}
: ${ezjail_sourcetree="/usr/src"} : ${ezjail_sourcetree="/usr/src"}
: ${ezjail_uglyperlhack="YES"} : ${ezjail_uglyperlhack="YES"}
: ${ezjail_default_execute="/usr/bin/login -f root"} : ${ezjail_default_execute="/usr/bin/login -f root"}
@ -312,20 +311,11 @@ ezjail_splitworld() {
# The user may want to have a ports tree in basejail # The user may want to have a ports tree in basejail
ezjail_updateports () { ezjail_updateports () {
local _portsnap_fetch="fetch" local _portsnap_fetch="fetch"
# if /usr/ports/CVS exists, assume cvs up is safe
# this is legacy
if [ -f "${ezjail_jailbase}/usr/ports/CVS/Root" ]; then
echo -n "Updating ports from "; cat "${ezjail_jailbase}/usr/ports/CVS/Root"
echo "Warning: Upgrading legacy ports copy. Consider removing ${ezjail_jailbase}/usr/ports and use the new portsnap strategy instead."
echo "Gathering local information may take a while."
cd "${ezjail_jailbase}/usr/ports/" && cvs -d "${ezjail_portscvsroot}" up -Pd
else
[ -z "$TERM" -o "$TERM" = "dumb" ] && _portsnap_fetch="cron" [ -z "$TERM" -o "$TERM" = "dumb" ] && _portsnap_fetch="cron"
portsnap ${_portsnap_fetch} portsnap ${_portsnap_fetch}
[ -d "${ezjail_jailbase}/usr/ports" ] && ezjail_portsnapaction="update" [ -d "${ezjail_jailbase}/usr/ports" ] && ezjail_portsnapaction="update"
portsnap -p "${ezjail_jailbase}/usr/ports" ${ezjail_portsnapaction:-"extract"} portsnap -p "${ezjail_jailbase}/usr/ports" ${ezjail_portsnapaction:-"extract"} || exerr "Error: Updating ports failed."
fi
[ $? -eq 0 ] || exerr "Error: Updating ports failed."
} }
# Try to fetch the list of releases the server provides # Try to fetch the list of releases the server provides

9
ezjail.conf.sample
View File

@ -19,10 +19,6 @@
# Location of your copy of FreeBSD's source tree # Location of your copy of FreeBSD's source tree
# ezjail_sourcetree=/usr/src # ezjail_sourcetree=/usr/src
# In case you want to provide a copy of ports tree in base jail, set this to
# a cvsroot near you
# ezjail_portscvsroot=freebsdanoncvs@anoncvs.FreeBSD.org:/home/ncvs
# This is where the install sub command defaults to fetch its packages from # This is where the install sub command defaults to fetch its packages from
# ezjail_ftphost=ftp.freebsd.org # ezjail_ftphost=ftp.freebsd.org
@ -50,11 +46,16 @@
# ezjail_procfs_enable="YES" # ezjail_procfs_enable="YES"
# ezjail_fdescfs_enable="YES" # ezjail_fdescfs_enable="YES"
# ZFS options
# Setting this to YES will start to manage the basejail and newjail in ZFS # Setting this to YES will start to manage the basejail and newjail in ZFS
# ezjail_use_zfs="YES" # ezjail_use_zfs="YES"
# Setting this to YES will manage ALL new jails in their own zfs # Setting this to YES will manage ALL new jails in their own zfs
# ezjail_use_zfs_for_jails="YES" # ezjail_use_zfs_for_jails="YES"
# The name of the ZFS ezjail should create jails on, it will be mounted at the ezjail_jaildir # The name of the ZFS ezjail should create jails on, it will be mounted at the ezjail_jaildir
# ezjail_jailzfs="tank/ezjail" # ezjail_jailzfs="tank/ezjail"
# ADVANCED, be very careful! # ADVANCED, be very careful!
# ezjail_zfs_properties="-o compression=lzjb -o atime=off" # ezjail_zfs_properties="-o compression=lzjb -o atime=off"

5
man5/ezjail.conf.5
View File

@ -56,11 +56,6 @@ Location of the flavours, where each directory is a different flavour.
.br .br
Default: Default:
.Em ${ezjail_jaildir}/flavours . .Em ${ezjail_jaildir}/flavours .
.It ezjail_portscvsroot (str)
CVS root to use when checking out or updating the ports tree in base jail.
.br
Default:
.Em :pserver:anoncvs@anoncvs.FreeBSD.org:/home/ncvs .
.It ezjail_ftphost (str) .It ezjail_ftphost (str)
This is where the install subcommand defaults to fetch its packages from. This is where the install subcommand defaults to fetch its packages from.
.br .br