From 712a4cdb5468e03d861a822bdf01c07a590477a9 Mon Sep 17 00:00:00 2001 From: erdgeist Date: Thu, 11 Apr 2013 16:37:20 +0000 Subject: Farewell CVS for ports. ezjail_portscvsroot is gone. --- ezjail-admin | 20 +++++--------------- ezjail.conf.sample | 13 +++++++------ man5/ezjail.conf.5 | 7 +------ 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/ezjail-admin b/ezjail-admin index 3099826..af62ae3 100755 --- a/ezjail-admin +++ b/ezjail-admin @@ -20,7 +20,6 @@ ezjail_jailcfgs="${ezjail_etc}/ezjail" : ${ezjail_jailtemp="${ezjail_jaildir}/ezjailtemp"} : ${ezjail_flavours_dir="${ezjail_jaildir}/flavours"} : ${ezjail_archivedir="${ezjail_jaildir}/ezjail_archives"} -: ${ezjail_portscvsroot="freebsdanoncvs@anoncvs.FreeBSD.org:/home/ncvs"} : ${ezjail_sourcetree="/usr/src"} : ${ezjail_uglyperlhack="YES"} : ${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 ezjail_updateports () { 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" - portsnap ${_portsnap_fetch} - [ -d "${ezjail_jailbase}/usr/ports" ] && ezjail_portsnapaction="update" - portsnap -p "${ezjail_jailbase}/usr/ports" ${ezjail_portsnapaction:-"extract"} - fi - [ $? -eq 0 ] || exerr "Error: Updating ports failed." + + [ -z "$TERM" -o "$TERM" = "dumb" ] && _portsnap_fetch="cron" + portsnap ${_portsnap_fetch} + [ -d "${ezjail_jailbase}/usr/ports" ] && ezjail_portsnapaction="update" + portsnap -p "${ezjail_jailbase}/usr/ports" ${ezjail_portsnapaction:-"extract"} || exerr "Error: Updating ports failed." } # Try to fetch the list of releases the server provides diff --git a/ezjail.conf.sample b/ezjail.conf.sample index 1815486..84b4f8b 100755 --- a/ezjail.conf.sample +++ b/ezjail.conf.sample @@ -6,7 +6,7 @@ # Location of jail root directories # -# Note: If you have spread your jails to multiple locations, use softlinks +# Note: If you have spread your jails to multiple locations, use softlinks # to collect them in this directory # ezjail_jaildir=/usr/jails @@ -19,10 +19,6 @@ # Location of your copy of FreeBSD's source tree # 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 # ezjail_ftphost=ftp.freebsd.org @@ -41,7 +37,7 @@ # Default options for newly created jails # -# Note: Be VERY careful about disabling ezjail_mount_enable. Mounting +# Note: Be VERY careful about disabling ezjail_mount_enable. Mounting # basejail via nullfs depends on this. You will have to find other # ways to provide your jail with essential system files # ezjail_mount_enable="YES" @@ -50,11 +46,16 @@ # ezjail_procfs_enable="YES" # ezjail_fdescfs_enable="YES" +# ZFS options + # Setting this to YES will start to manage the basejail and newjail in ZFS # ezjail_use_zfs="YES" + # Setting this to YES will manage ALL new jails in their own zfs # ezjail_use_zfs_for_jails="YES" + # The name of the ZFS ezjail should create jails on, it will be mounted at the ezjail_jaildir + # ezjail_jailzfs="tank/ezjail" # ADVANCED, be very careful! # ezjail_zfs_properties="-o compression=lzjb -o atime=off" diff --git a/man5/ezjail.conf.5 b/man5/ezjail.conf.5 index 19eb2a1..806e760 100755 --- a/man5/ezjail.conf.5 +++ b/man5/ezjail.conf.5 @@ -56,11 +56,6 @@ Location of the flavours, where each directory is a different flavour. .br Default: .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) This is where the install subcommand defaults to fetch its packages from. .br @@ -222,4 +217,4 @@ The man page is based on a draft by .Aq joeb1@a1poweruser.com and was rewritten by .An Frederic Perrin -.Aq frederic.perrin@resel.fr . \ No newline at end of file +.Aq frederic.perrin@resel.fr . -- cgit v1.2.3