From 6b3c22dd756861d7b27299244d408376b1e2b986 Mon Sep 17 00:00:00 2001
From: Matthew Thode <mthode@mthode.org>
Date: Wed, 21 Feb 2018 11:06:16 -0600
Subject: [PATCH] update Gentoo Hardened profiles (now stable)
Change-Id: I6d89f27bfd62fc0e86fec1a0bc6cb37f9ec6c82f
Signed-off-by: Matthew Thode <mthode@mthode.org>
---
diskimage_builder/elements/gentoo/README.rst | 4 ++--
diskimage_builder/elements/gentoo/root.d/10-gentoo-image | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/diskimage_builder/elements/gentoo/README.rst b/diskimage_builder/elements/gentoo/README.rst
index e3536bd19..ca11c6522 100644
--- a/diskimage_builder/elements/gentoo/README.rst
+++ b/diskimage_builder/elements/gentoo/README.rst
@@ -28,8 +28,8 @@ Notes:
default/linux/amd64/17.0
default/linux/amd64/17.0/no-multilib
- hardened/linux/amd64
- hardened/linux/amd64/no-multilib
+ default/linux/amd64/17.0/hardened
+ default/linux/amd64/17.0/no-multilib/hardened
* You can set the GENTOO_PORTAGE_CLEANUP environment variable to true (or
anything other than False) to clean up portage from the system and get the
diff --git a/diskimage_builder/elements/gentoo/root.d/10-gentoo-image b/diskimage_builder/elements/gentoo/root.d/10-gentoo-image
index 3d7174ad0..57166ec42 100755
--- a/diskimage_builder/elements/gentoo/root.d/10-gentoo-image
+++ b/diskimage_builder/elements/gentoo/root.d/10-gentoo-image
@@ -45,18 +45,18 @@ if [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0" ]]; then
elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/no-multilib" ]]; then
FILENAME_BASE='gentoo-stage4-nomultilib'
SIGNED_SOURCE_SUFFIX='minimal-nomultilib'
-elif [[ "${GENTOO_PROFILE}" == "hardened/linux/amd64" ]]; then
+elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/hardened" ]]; then
FILENAME_BASE='gentoo-stage4-hardened'
SIGNED_SOURCE_SUFFIX='hardened+minimal'
-elif [[ "${GENTOO_PROFILE}" == "hardened/linux/amd64/no-multilib" ]]; then
+elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/no-multilib/hardened" ]]; then
FILENAME_BASE='gentoo-stage4-hardened-nomultilib'
SIGNED_SOURCE_SUFFIX='hardened+minimal-nomultilib'
else
echo 'invalid profile, please select from the following profiles'
echo 'default/linux/amd64/17.0'
echo 'default/linux/amd64/17.0/no-multilib'
- echo 'hardened/linux/amd64'
- echo 'hardened/linux/amd64/no-multilib'
+ echo 'default/linux/amd64/17.0/hardened'
+ echo 'default/linux/amd64/17.0/no-multilib/hardened'
exit 1
fi