From e7288f5035cc2c3aa1bee7e7dfd22a57cb8e8ea4 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Thu, 27 Apr 2017 05:44:32 +0000
Subject: [PATCH] scripts: pull in hardened image, not grsec image
---
scripts/mkimg.arm.sh | 2 +-
scripts/mkimg.base.sh | 2 +-
scripts/mkimg.standard.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/mkimg.arm.sh b/scripts/mkimg.arm.sh
index dd29bac5759e..d4b4ac6a7833 100755
--- a/scripts/mkimg.arm.sh
+++ b/scripts/mkimg.arm.sh
@@ -83,7 +83,7 @@ profile_uboot() {
kernel_addons=
;;
*)
- kernel_flavors="grsec"
+ kernel_flavors="hardened"
kernel_addons="xtables-addons"
;;
esac
diff --git a/scripts/mkimg.base.sh b/scripts/mkimg.base.sh
index f94e819be841..7eedb022e0a0 100755
--- a/scripts/mkimg.base.sh
+++ b/scripts/mkimg.base.sh
@@ -268,7 +268,7 @@ create_image_targz() {
}
profile_base() {
- kernel_flavors="grsec"
+ kernel_flavors="hardened"
initfs_cmdline="modules=loop,squashfs,sd-mod,usb-storage quiet"
initfs_features="ata base bootchart cdrom squashfs ext2 ext3 ext4 mmc raid scsi usb virtio"
#grub_mod="disk part_msdos linux normal configfile search search_label efi_uga efi_gop fat iso9660 cat echo ls test true help"
diff --git a/scripts/mkimg.standard.sh b/scripts/mkimg.standard.sh
index 5e18160c9abb..54c7b8002182 100755
--- a/scripts/mkimg.standard.sh
+++ b/scripts/mkimg.standard.sh
@@ -52,7 +52,7 @@ profile_extended() {
profile_virt() {
profile_standard
kernel_addons=
- kernel_flavors="virtgrsec"
+ kernel_flavors="virthardened"
kernel_cmdline="console=tty0 console=ttyS0,115200"
syslinux_serial="0 115200"
}
--
GitLab