From 390064247190f34d11f562e6a6554d9b388ce248 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 5 Jun 2024 11:11:01 +0100 Subject: [PATCH] move root check to lib.sh (bugfix) this avoids writing the version/versiondate files as root. this complements the previous fix, that avoided writing those same files when running the dependencies command. initial setup of the build system requires root, to run the dependencies script, but otherwise the build system prevents running as root for everything else, so we must avoid writing the version/versiondate files as root. that same avoidance is necessary when checking whether running other commands as root; ironically, this check then prevented running the build system at all! the bug should be fully fixed now. i found this quite by accident the other day, when testing something else. good thing this got fixed because the release! Signed-off-by: Leah Rowe --- build | 2 -- include/lib.sh | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build b/build index 34af272..f63f3a8 100755 --- a/build +++ b/build @@ -26,8 +26,6 @@ main() [ $# -lt 1 ] && badcmd spath="script/$1" - [ "$(id -u)" != "0" ] || $err "this command as root is not permitted" - for g in "which git" "git config --global user.name" \ "git config --global user.email" "git_init"; do eval "$g 1>/dev/null 2>/dev/null || git_err \"$g\"" diff --git a/include/lib.sh b/include/lib.sh index c5bd4bc..23dfe81 100755 --- a/include/lib.sh +++ b/include/lib.sh @@ -61,6 +61,8 @@ install_packages() } [ $# -gt 0 ] && [ "$1" = "dependencies" ] && install_packages $@ && return 0 +[ "$(id -u)" != "0" ] || $err "this command as root is not permitted" + # if "y": a coreboot target won't be built if target.cfg says release="n" # (this is used to exclude certain build targets from releases)