Skip to content

Fix package installation during "iocell create" (#19) #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
orichoni wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix package installation during "iocell create" (#19) #26

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0922eec
Fix package installation during "iocell create" (#19)
orichoni Jun 23, 2017
403f0f5
Cleanup: old template
orichoni Jul 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 36 additions & 55 deletions lib/ioc-zfs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ __check_basejail () {
__create_jail () {
local _installed _releases _zfsconfig _supported_release _configured \
_pname _prop _isprop _jail_zfs_mountpoint _basedir_list _uuid \
_template _zfs_dataset
_zfs_dataset

_installed=$(zfs list -rH ${pool}/iocell/releases | grep ${release})
_releases=$(__list_jails -r | grep -v "Downloaded releases:")
Expand All @@ -502,7 +502,6 @@ __create_jail () {
proc
mnt
var/run"
_template="0"

if [ -z "${_supported_release}" -a "${2}" != "-e" -a "${1}" = "create" -a -z "${_installed}" ] ; then
echo " You are not running a production RELEASE. (${release})" >&2
Expand Down Expand Up @@ -541,7 +540,7 @@ __create_jail () {
if [ "${_pname}" = "istemplate" ] ; then
__die "please set template after creation"
elif [ "${_pname}" = "template" ] ; then
_template="1"
__die "property "template" is obsolete, please use "istemplate" instead"
fi
fi
done
Expand Down Expand Up @@ -584,62 +583,48 @@ __create_jail () {
fi
done

# Template jails are essentially overlays and not true basejails.
if [ "${_template}" = "1" ] ; then
mkdir ${iocroot}/jails/${uuid}/_
for _bdir in ${_basedir_list} ; do
mkdir -p ${iocroot}/jails/${uuid}/_/${_bdir}

if [ "${_bdir}" = "tmp" ] ; then
chmod 1777 ${iocroot}/jails/${uuid}/_/tmp
fi
done
fi

# configure the jail mountpoint
# Supplying _uuid again so since we need to use that for mounting/unmounting
__hack88_mount ${uuid} ${pool}/iocell/jails/${uuid} _uuid

if [ "${_template}" != "1" ] ; then
# We need the base's /etc and /root
cd ${iocroot}/releases/${release}/root/etc && find . | \
cpio -dp --quiet ${iocroot}/jails/${uuid}/root/etc
cd ${iocroot}/releases/${release}/root/root && find . | \
cpio -dp --quiet ${iocroot}/jails/${uuid}/root/root
# We need the base's /etc and /root
cd ${iocroot}/releases/${release}/root/etc && find . | \
cpio -dp --quiet ${iocroot}/jails/${uuid}/root/etc
cd ${iocroot}/releases/${release}/root/root && find . | \
cpio -dp --quiet ${iocroot}/jails/${uuid}/root/root

if [ -e "/etc/localtime" ] ; then
cp /etc/localtime ${iocroot}/jails/${uuid}/root/etc/
fi

# remove any residual clone snapshots carried over from the RELEASE datasets
__snapremove ${uuid}@ALL ${pool}/iocell/jails/${uuid}

if [ ! -e "${iocroot}/jails/${uuid}/root/etc/resolv.conf" ] ; then
__resolv_conf ${uuid} ${pool}/iocell/jails/${uuid} > \
${iocroot}/jails/${uuid}/root/etc/resolv.conf
fi
if [ -e "/etc/localtime" ] ; then
cp /etc/localtime ${iocroot}/jails/${uuid}/root/etc/
fi

# Make sure the etcupdate we need for upgrades exists
if [ ! -e "${iocroot}/releases/${release}/root/etcupdate" ] ; then
mount -t devfs devfs ${iocroot}/releases/${release}/root/dev
mkdir ${iocroot}/releases/${release}/root/etcupdate
chroot ${iocroot}/releases/${release}/root \
etcupdate build /etcupdate/etcupdate-${release}.tbz
umount ${iocroot}/releases/${release}/root/dev
fi
# remove any residual clone snapshots carried over from the RELEASE datasets
__snapremove ${uuid}@ALL ${pool}/iocell/jails/${uuid}

# Goop to get basejails and the etcupdate ready to go
mount -t devfs devfs ${iocroot}/jails/${_uuid}/root/dev
__mount_basejail "${_uuid}" "${release}"
mkdir -p ${iocroot}/jails/${_uuid}/root/var/db/etcupdate
chroot ${iocroot}/jails/${_uuid}/root etcupdate \
extract -t /etcupdate/etcupdate-${release}.tbz
umount ${iocroot}/jails/${_uuid}/root/dev
umount ${iocroot}/jails/${_uuid}/root/tmp
__umount_basejail "${_uuid}" "${pool}/iocell/jails/${_uuid}" \
> /dev/null 2>&1
if [ ! -e "${iocroot}/jails/${uuid}/root/etc/resolv.conf" ] ; then
__resolv_conf ${uuid} ${pool}/iocell/jails/${uuid} > \
${iocroot}/jails/${uuid}/root/etc/resolv.conf
fi

# Make sure the etcupdate we need for upgrades exists
if [ ! -e "${iocroot}/releases/${release}/root/etcupdate" ] ; then
mount -t devfs devfs ${iocroot}/releases/${release}/root/dev
mkdir ${iocroot}/releases/${release}/root/etcupdate
chroot ${iocroot}/releases/${release}/root \
etcupdate build /etcupdate/etcupdate-${release}.tbz
umount ${iocroot}/releases/${release}/root/dev
fi

# Goop to get basejails and the etcupdate ready to go
mount -t devfs devfs ${iocroot}/jails/${_uuid}/root/dev
__mount_basejail "${_uuid}" "${release}"
mkdir -p ${iocroot}/jails/${_uuid}/root/var/db/etcupdate
chroot ${iocroot}/jails/${_uuid}/root etcupdate \
extract -t /etcupdate/etcupdate-${release}.tbz
umount ${iocroot}/jails/${_uuid}/root/dev
umount ${iocroot}/jails/${_uuid}/root/tmp
__umount_basejail "${_uuid}" "${pool}/iocell/jails/${_uuid}" \
> /dev/null 2>&1

for _prop in "$@" ; do
_pname="$(echo ${_prop} | awk 'BEGIN { FS = "=" } ; { print $1 }')"
# Look to see if the user wants a jailed dataset,
Expand Down Expand Up @@ -700,11 +685,7 @@ __create_jail () {
mount -t tmpfs tmpfs ${iocroot}/jails/${uuid}/root/tmp
mount -t devfs devfs ${iocroot}/jails/${uuid}/root/dev

if [ "${_template}" != "1" ] ; then
__mount_basejail "${uuid}" "${template}"
else
__mount_basejail "${uuid}" "${release}"
fi
__mount_basejail "${uuid}" "${release}"

__pkg_install "${iocroot}/jails/${uuid}/root"
fi
Expand Down