Commit 71a193e9 authored by Natanael Copa's avatar Natanael Copa

scripts/mkimg: remove -hardened kernel and vanilla iso

standard iso is now vanilla kernel so it does not make any sense to have
a separata vanilla iso.

Also update xen to use vanilla kernel instead of hardened
parent abd16aa5
......@@ -48,7 +48,7 @@ profile_rpi() {
profile_base
title="Raspberry Pi"
desc="Includes Raspberry Pi kernel.
Does not include grsec patchset.
Designed for RPI 1,2 and 3.
And much more..."
image_ext="tar.gz"
arch="armhf"
......@@ -86,16 +86,8 @@ profile_uboot() {
Supports armhf and aarch64."
image_ext="tar.gz"
arch="aarch64 armhf armv7"
case "$ARCH" in
aarch64)
kernel_flavors="vanilla"
kernel_addons=
;;
*)
kernel_flavors="hardened"
kernel_addons="xtables-addons"
;;
esac
kernel_flavors="vanilla"
kernel_addons="xtables-addons"
initfs_features="base bootchart squashfs ext2 ext3 ext4 kms mmc raid scsi usb"
apkovl="genapkovl-dhcp.sh"
hostname="alpine"
......
......@@ -267,7 +267,7 @@ create_image_targz() {
}
profile_base() {
kernel_flavors="hardened"
kernel_flavors="vanilla"
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"
......
......@@ -5,24 +5,12 @@ profile_standard() {
Network connection is required."
profile_base
image_ext="iso"
arch="x86 x86_64"
arch="x86 x86_64 ppc64le"
output_format="iso"
kernel_cmdline="nomodeset"
kernel_addons="xtables-addons"
}
profile_vanilla() {
profile_standard
title="Vanilla"
desc="Includes a vanilla kernel.
Does not include grsec patch set.
Suitable for debugging."
#arch="$arch aarch64"
arch="$arch ppc64le"
kernel_flavors="vanilla"
kernel_addons=
}
profile_extended() {
profile_standard
title="Extended"
......@@ -70,7 +58,7 @@ profile_virt() {
Slimmed down kernel.
Optimized for virtual systems."
kernel_addons=
kernel_flavors="virthardened"
kernel_flavors="virt"
kernel_cmdline="console=tty0 console=ttyS0,115200"
syslinux_serial="0 115200"
}
......@@ -12,7 +12,7 @@ profile_xen() {
title="Xen"
desc="Build-in support for Xen Hypervisor.
Includes packages targed at Xen usage.
Includes grsec kernel."
Use for Xen Dom 0."
arch="x86_64"
kernel_cmdline="nomodeset"
xen_params=""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment