Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

set "HOME" after switching to netdata user #16548

Merged
merged 3 commits into from Dec 7, 2023
Merged

set "HOME" after switching to netdata user #16548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7e58b0
set "HOME" after switching to user
ilyam8 Dec 5, 2023
84ccfb9
add install-service.sh to CLEANFILES
ilyam8 Dec 5, 2023
34d95b7
use getpwuid because failure on switching to user is not fatal
ilyam8 Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion daemon/analytics.c
View file
Open in desktop
Expand Up @@ -842,7 +842,6 @@ void set_global_environment() {
setenv("NETDATA_LIB_DIR", verify_or_create_required_directory(netdata_configured_varlib_dir), 1);
setenv("NETDATA_LOCK_DIR", verify_or_create_required_directory(netdata_configured_lock_dir), 1);
setenv("NETDATA_LOG_DIR", verify_or_create_required_directory(netdata_configured_log_dir), 1);
setenv("HOME", verify_or_create_required_directory(netdata_configured_home_dir), 1);
setenv("NETDATA_HOST_PREFIX", netdata_configured_host_prefix, 1);

{
Expand Down
12 changes: 10 additions & 2 deletions daemon/main.c
View file
Open in desktop
Expand Up @@ -1167,8 +1167,6 @@ static void get_netdata_configured_variables() {
netdata_configured_web_dir = config_get(CONFIG_SECTION_DIRECTORIES, "web", netdata_configured_web_dir);
netdata_configured_cache_dir = config_get(CONFIG_SECTION_DIRECTORIES, "cache", netdata_configured_cache_dir);
netdata_configured_varlib_dir = config_get(CONFIG_SECTION_DIRECTORIES, "lib", netdata_configured_varlib_dir);
char *env_home=getenv("HOME");
netdata_configured_home_dir = config_get(CONFIG_SECTION_DIRECTORIES, "home", env_home?env_home:netdata_configured_home_dir);

netdata_configured_lock_dir = initialize_lock_directory_path(netdata_configured_varlib_dir);

Expand Down Expand Up @@ -2070,6 +2068,16 @@ int main(int argc, char **argv) {
if(become_daemon(dont_fork, user) == -1)
fatal("Cannot daemonize myself.");

// The "HOME" env var points to the root's home dir because Netdata starts as root. Can't use "HOME".
struct passwd *pw = getpwuid(getuid());
ilyam8 marked this conversation as resolved.
Show resolved Hide resolved
if (config_exists(CONFIG_SECTION_DIRECTORIES, "home") || !pw || !pw->pw_dir) {
netdata_configured_home_dir = config_get(CONFIG_SECTION_DIRECTORIES, "home", netdata_configured_home_dir);
} else {
netdata_configured_home_dir = config_get(CONFIG_SECTION_DIRECTORIES, "home", pw->pw_dir);
}

setenv("HOME", netdata_configured_home_dir, 1);

dyn_conf_init();

netdata_log_info("netdata started on pid %d.", getpid());
Expand Down
1 change: 1 addition & 0 deletions system/Makefile.am
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@

MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
CLEANFILES = \
install-service.sh \
cron/netdata-updater-daily \
freebsd/rc.d/netdata \
initd/init.d/netdata \
Expand Down