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

Add -K option to install, which can be used to upgrade basejail to a newer FreeBSD version without loosing old libs inside the basejail. Could replace "update -U".

Browse Source
This commit is contained in:
Philipp Wuensche 2019-08-14 14:27:45 +02:00
parent b418a79584
commit aac83f6591
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ezjail-admin
View File

@ -42,7 +42,7 @@ case `uname -p` in amd64) ezjail_dirlist="${ezjail_dirlist} usr/lib32"; ezjail_b
# Synopsis messages # Synopsis messages
ezjail_usage_ezjailadmin="${ezjail_admin} v3.4.2\nUsage: ${ezjail_admin} [archive|config|console|create|delete|freeze|install|list|restore|snapshot|troubleshoot|update] {params}" ezjail_usage_ezjailadmin="${ezjail_admin} v3.4.2\nUsage: ${ezjail_admin} [archive|config|console|create|delete|freeze|install|list|restore|snapshot|troubleshoot|update] {params}"
ezjail_usage_install="Usage: ${ezjail_admin} install [-mMpPsS] [-h host] [-r release]" ezjail_usage_install="Usage: ${ezjail_admin} install [-mMpPsSK] [-h host] [-r release]"
ezjail_usage_create="Usage: ${ezjail_admin} create [-xbi] [-f flavour] [-r jailroot] [-s size] [-c bde|eli|zfs] [-C args] [-a archive] [-z parentzfs] jailname jailip" ezjail_usage_create="Usage: ${ezjail_admin} create [-xbi] [-f flavour] [-r jailroot] [-s size] [-c bde|eli|zfs] [-C args] [-a archive] [-z parentzfs] jailname jailip"
ezjail_usage_delete="Usage: ${ezjail_admin} delete [-wf] jailname" ezjail_usage_delete="Usage: ${ezjail_admin} delete [-wf] jailname"
ezjail_usage_update="Usage: ${ezjail_admin} update [-s sourcetree|sourceosversion] [-p] (-b|-i|-u|-U|-P)" ezjail_usage_update="Usage: ${ezjail_admin} update [-s sourcetree|sourceosversion] [-p] (-b|-i|-u|-U|-P)"
@ -286,7 +286,7 @@ ezjail_splitworld() {
# directories with permission 0700 which is bad # directories with permission 0700 which is bad
mkdir -p "${ezjail_jailbase}/usr" mkdir -p "${ezjail_jailbase}/usr"
for dir in ${ezjail_dirlist}; do for dir in ${ezjail_dirlist}; do
find ${dir} | cpio -d -p -v "${ezjail_jailbase}" || exerr "Error: Installation of ${dir} failed." find ${dir} | cpio -d -p -v ${ezjail_keep_basejail} "${ezjail_jailbase}" || exerr "Error: Installation of ${dir} failed."
chflags -R noschg ${dir}; rm -r ${dir}; ln -s /basejail/${dir} ${dir} chflags -R noschg ${dir}; rm -r ${dir}; ln -s /basejail/${dir} ${dir}
done done
mkdir basejail mkdir basejail
@ -1067,7 +1067,7 @@ install)
# Clean variables, prevent pollution # Clean variables, prevent pollution
unset ezjail_release ezjail_installmanpages ezjail_installports ezjail_installsources ezjail_dir ezjail_ftpserverqueried ezjail_proto ezjail_disturi unset ezjail_release ezjail_installmanpages ezjail_installports ezjail_installsources ezjail_dir ezjail_ftpserverqueried ezjail_proto ezjail_disturi
shift; while getopts :mMpPsSh:r: arg; do case ${arg} in shift; while getopts :mMpPsSh:Kr: arg; do case ${arg} in
m) ezjail_installmanpages=" manpages";; m) ezjail_installmanpages=" manpages";;
M) ezjail_installmanpages=" manpages"; unset ezjail_basesystem;; M) ezjail_installmanpages=" manpages"; unset ezjail_basesystem;;
s) ezjail_installsources=" src";; s) ezjail_installsources=" src";;
@ -1075,6 +1075,7 @@ install)
p) ezjail_installports="YES";; p) ezjail_installports="YES";;
P) ezjail_installports="YES"; unset ezjail_basesystem;; P) ezjail_installports="YES"; unset ezjail_basesystem;;
h) ezjail_ftphost=${OPTARG};; h) ezjail_ftphost=${OPTARG};;
K) ezjail_keep_basejail="-u";;
r) ezjail_release=${OPTARG};; r) ezjail_release=${OPTARG};;
?) exerr ${ezjail_usage_install};; ?) exerr ${ezjail_usage_install};;
esac; done; shift $(( ${OPTIND} - 1 )) esac; done; shift $(( ${OPTIND} - 1 ))

5
man8/ezjail-admin.8
View File

@ -6,7 +6,7 @@
.Nd Administrate ezjail environment .Nd Administrate ezjail environment
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm Cm install .Nm Cm install
.Op Fl mMpPsS .Op Fl mMpPsSK
.Op Fl h Ar host .Op Fl h Ar host
.Op Fl r Ar release .Op Fl r Ar release
.Nm .Nm
@ -123,6 +123,9 @@ for details or
.Xr portsnap 8 . .Xr portsnap 8 .
.It Fl P .It Fl P
Fetch and extract a ports tree, without (re)installing the base jail. Fetch and extract a ports tree, without (re)installing the base jail.
.It Fl K
Reinstall the base jail and the new jail template. Can be used together with -r
to upgrade both to a newer FreeBSD version.
.It Fl h Ar host .It Fl h Ar host
Set the remote host to fetch FreeBSD distribution sets from. If absent the Set the remote host to fetch FreeBSD distribution sets from. If absent the
default host default host