sravan/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Arch config by default + state when config_hardened is used (#305)

Browse Source 
* prepare: fix config_hardened + make arch config default for all distros

Signed-off-by: Adel KARA SLIMANE <adel.ks@zegrapher.com>

* prepare: pring message about using hardnened config file

Signed-off-by: Adel KARA SLIMANE <adel.ks@zegrapher.com>

* README: update about the change with the default config file

Signed-off-by: Adel KARA SLIMANE <adel.ks@zegrapher.com>

* install.sh: additional dependencies

Signed-off-by: Adel KARA SLIMANE <adel.ks@zegrapher.com>
This commit is contained in:
Adel Kara Slimane
2021-09-21 12:20:35 +02:00
committed by GitHub
parent c686050832
commit 05f874d877
4 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
linux-tkg-config/prepare
View File

@@ -362,15 +362,15 @@ _tkg_srcprep() {
tkgpatch="$srcdir/patch-${pkgver}"
_msg="Patching from $_basekernel to $pkgver" && _tkg_patcher
fi
fi
# ARCH Patches
if [ "${_configfile}" = "config_hardened.x86_64" ] && [ "${_cpusched}" = "cfs" ]; then
tkgpatch="$srcdir/0012-linux-hardened.patch"
_msg="Using linux hardened patchset" && _tkg_patcher
else
tkgpatch="$srcdir/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch"
_msg="Using Arch patches" && _tkg_patcher
fi
# Hardened Patches
if [ "${_configfile}" = "config_hardened.x86_64" ] && [ "${_cpusched}" = "cfs" ]; then
tkgpatch="$srcdir/0012-linux-hardened.patch"
_msg="Using linux hardened patchset" && _tkg_patcher
else
tkgpatch="$srcdir/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch"
_msg="Using Arch patches" && _tkg_patcher
fi
# Void
@@ -527,18 +527,21 @@ _tkg_srcprep() {
if [ -z "${_configfile}" ]; then
if [ "${_distro}" = "Arch" ] || [ "$_distro" = "Void" ]; then
cat "${srcdir}"/config.x86_64 > ./.config
msg2 "Using archlinux's default config file for kernel ${_basekernel}"
cat "${srcdir}"/config.x86_64 > ./.config
elif [ "${_configfile}" = "config_hardened.x86_64" ]; then
msg2 "Using archlinux's hardened config file for kernel ${_basekernel}"
cat "${srcdir}"/config_hardened.x86_64 > ./.config
elif [ "${_configfile}" = "running-kernel" ]; then
if [ -f /boot/config-`uname -r` ];then
msg2 "Using /boot/config-`uname -r` as config file"
cp /boot/config-`uname -r` .config
elif [ -f /proc/config.gz ];then
msg2 "Using /proc/config.gz as config file"
zcat --verbose /proc/config.gz > .config
else
if [ -f /boot/config-`uname -r` ];then
msg2 "Using /boot/config-`uname -r` as config file"
cp /boot/config-`uname -r` .config
elif [ -f /proc/config.gz ];then
msg2 "Using /proc/config.gz as config file"
zcat --verbose /proc/config.gz > .config
else
msg2 "Current kernel config not found! Falling back to default..."
fi
warning "Cannot get config file of running kernel"
exit 1
fi
else
msg2 "Using user-provided config file in ${_where}/${_configfile}"