diff --git a/usr/local/share/bastille/cp.sh b/usr/local/share/bastille/cp.sh index 063c506c..2d486ece 100644 --- a/usr/local/share/bastille/cp.sh +++ b/usr/local/share/bastille/cp.sh @@ -66,7 +66,7 @@ esac for _jail in ${JAILS}; do info "[${_jail}]:" bastille_jail_path="${bastille_jailsdir}/${_jail}/root" - cp "${OPTION}" "${CPSOURCE}" "${bastille_jail_path}${CPDEST}" + cp "${OPTION}" "${CPSOURCE}" "${bastille_jail_path}/${CPDEST}" RETURN="$?" if [ "${TARGET}" = "ALL" ]; then # Display the return status for reference diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh index fb3023bc..802e4715 100644 --- a/usr/local/share/bastille/create.sh +++ b/usr/local/share/bastille/create.sh @@ -113,6 +113,13 @@ validate_netconf() { } validate_release() { + ## ensure the user set the Linux(experimental) option explicitly + if [ -n "${UBUNTU}" ]; then + if [ -z "${LINUX_JAIL}" ]; then + usage + fi + fi + ## check release name match, else show usage if [ -n "${NAME_VERIFY}" ]; then RELEASE="${NAME_VERIFY}" @@ -644,10 +651,12 @@ if [ -z "${EMPTY_JAIL}" ]; then validate_release ;; ubuntu_bionic|bionic|ubuntu-bionic) + UBUNTU="1" NAME_VERIFY=Ubuntu_1804 validate_release ;; ubuntu_focal|focal|ubuntu-focal) + UBUNTU="1" NAME_VERIFY=Ubuntu_2004 validate_release ;;