From 4bb370b2370da10c6a9cfed08cf41e58394b1ee5 Mon Sep 17 00:00:00 2001 From: kuzetsa Date: Thu, 13 Sep 2018 18:00:11 -0400 Subject: [PATCH] profile bump to 17.0 https://github.com/prometheanfire/gentoo-cloud-prep/issues/21 --- 01-get-stage3.sh | 10 +++++----- 02-catalyst-that-shit.sh | 10 +++++----- 03-prep-that-image.sh | 10 +++++----- README.md | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/01-get-stage3.sh b/01-get-stage3.sh index b4dea0b..2616fe9 100755 --- a/01-get-stage3.sh +++ b/01-get-stage3.sh @@ -10,22 +10,22 @@ export MIRROR=${MIRROR:-"http://gentoo.osuosl.org"} export OUTDIR=${OUTDIR:-"/var/tmp/catalyst/builds"} export PORTAGE_DIR=${PORTAGE_DIR:-"/var/tmp/catalyst/snapshots"} # profiles supported are as follows -# default/linux/amd64/13.0 -# default/linux/amd64/13.0/no-multilib +# default/linux/amd64/17.0 +# default/linux/amd64/17.0/no-multilib # hardened/linux/amd64 # hardened/linux/amd64/no-multilib # hardened/linux/amd64/selinux (eventually) # hardened/linux/amd64/no-multilib/selinux (eventually) -export PROFILE=${PROFILE:-"default/linux/amd64/13.0"} +export PROFILE=${PROFILE:-"default/linux/amd64/17.0"} mkdir -p "${OUTDIR}" -if [[ "${PROFILE}" == "default/linux/amd64/13.0" ]]; then +if [[ "${PROFILE}" == "default/linux/amd64/17.0" ]]; then STAGE3_NAME="stage3-amd64-current.tar.bz2" STAGE3_REAL_PATH=$(curl -s "${MIRROR}/releases/amd64/autobuilds/latest-stage3-amd64.txt" | awk '/stage3/ { print $1 }') STAGE3_REAL_NAME=$(echo -n "${STAGE3_REAL_PATH}" | awk -F/ '{ print $2}') STAGE3_URL="${MIRROR}/releases/amd64/autobuilds/current-stage3-amd64/${STAGE3_REAL_NAME}" -elif [[ "${PROFILE}" == "default/linux/amd64/13.0/no-multilib" ]]; then +elif [[ "${PROFILE}" == "default/linux/amd64/17.0/no-multilib" ]]; then STAGE3_NAME="stage3-amd64-nomultilib-current.tar.bz2" STAGE3_REAL_PATH=$(curl -s "${MIRROR}/releases/amd64/autobuilds/latest-stage3-amd64-nomultilib.txt" | awk '/stage3/ { print $1 }') STAGE3_REAL_NAME=$(echo -n "${STAGE3_REAL_PATH}" | awk -F/ '{ print $2}') diff --git a/02-catalyst-that-shit.sh b/02-catalyst-that-shit.sh index 3a7953f..eb4a736 100755 --- a/02-catalyst-that-shit.sh +++ b/02-catalyst-that-shit.sh @@ -15,20 +15,20 @@ export DATE=${DATE:-"$(date +%Y%m%d)"} export OUTDIR=${OUTDIR:-"/root/tmp/catalyst/gentoo"} export GIT_BASE_DIR=${GIT_BASE_DIR:-$( cd "$( dirname ${BASH_SOURCE[0]} )" && pwd )} # profiles supported are as follows -# default/linux/amd64/13.0 -# default/linux/amd64/13.0/no-multilib +# default/linux/amd64/17.0 +# default/linux/amd64/17.0/no-multilib # hardened/linux/amd64 # hardened/linux/amd64/no-multilib # hardened/linux/amd64/selinux (eventually) # hardened/linux/amd64/no-multilib/selinux (eventually) -export PROFILE=${PROFILE:-"default/linux/amd64/13.0"} +export PROFILE=${PROFILE:-"default/linux/amd64/17.0"} -if [[ "${PROFILE}" == "default/linux/amd64/13.0" ]]; then +if [[ "${PROFILE}" == "default/linux/amd64/17.0" ]]; then PROFILE_SHORTNAME="amd64-default" SOURCE_SUBPATH="stage3-amd64-current" KERNEL_SOURCES="gentoo-sources" -elif [[ "${PROFILE}" == "default/linux/amd64/13.0/no-multilib" ]]; then +elif [[ "${PROFILE}" == "default/linux/amd64/17.0/no-multilib" ]]; then PROFILE_SHORTNAME="amd64-default-nomultilib" SOURCE_SUBPATH="stage3-amd64-nomultilib-current" KERNEL_SOURCES="gentoo-sources" diff --git a/03-prep-that-image.sh b/03-prep-that-image.sh index e374869..09d8f9b 100755 --- a/03-prep-that-image.sh +++ b/03-prep-that-image.sh @@ -12,16 +12,16 @@ export MOUNT_DIR=${MOUNT_DIR:-'/mnt'} export DATE=${DATE:-"$(date +%Y%m%d)"} export PORTAGE_DIR=${PORTAGE_DIR:-"/var/tmp/catalyst/snapshots"} # profiles supported are as follows -# default/linux/amd64/13.0 -# default/linux/amd64/13.0/no-multilib +# default/linux/amd64/17.0 +# default/linux/amd64/17.0/no-multilib # hardened/linux/amd64 # hardened/linux/amd64/no-multilib # hardened/linux/amd64/selinux (eventually) # hardened/linux/amd64/no-multilib/selinux (eventually) -export PROFILE=${PROFILE:-"default/linux/amd64/13.0"} -if [[ "${PROFILE}" == "default/linux/amd64/13.0" ]]; then +export PROFILE=${PROFILE:-"default/linux/amd64/17.0"} +if [[ "${PROFILE}" == "default/linux/amd64/17.0" ]]; then PROFILE_SHORTNAME="amd64-default" -elif [[ "${PROFILE}" == "default/linux/amd64/13.0/no-multilib" ]]; then +elif [[ "${PROFILE}" == "default/linux/amd64/17.0/no-multilib" ]]; then PROFILE_SHORTNAME="amd64-default-nomultilib" elif [[ "${PROFILE}" == "hardened/linux/amd64" ]]; then PROFILE_SHORTNAME="amd64-hardened" diff --git a/README.md b/README.md index d4a7ea3..f00f0b2 100644 --- a/README.md +++ b/README.md @@ -18,12 +18,12 @@ Run the scripts in order, and you'll have a shiny new set of files, depending on set the profile you want, valid ones are as follows -- default/linux/amd64/13.0 -- default/linux/amd64/13.0/no-multilib +- default/linux/amd64/17.0 +- default/linux/amd64/17.0/no-multilib - hardened/linux/amd64 - hardened/linux/amd64/no-multilib -`export PROFILE="default/linux/amd64/13.0"` +`export PROFILE="default/linux/amd64/17.0"` Of note to hardened users is that this uses catalyst, which uses chroots, so you need to allow grsec things for chroots