From f9987273cb84cfe2deebc6c837c65b5ddcc966c2 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Thu, 28 Jan 2016 15:42:09 -0600 Subject: [PATCH] fix unable to use sudo after reboot format sudo directives --- src/ccmodules/users.c | 2 ++ src/main.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ccmodules/users.c b/src/ccmodules/users.c index 7ed7e99..f3199cd 100644 --- a/src/ccmodules/users.c +++ b/src/ccmodules/users.c @@ -212,8 +212,10 @@ static void users_item(GNode* node, gpointer data) { item = cloud_config_find(node, SUDO); if (item) { sudo_directives = g_string_new(""); + g_string_printf(sudo_directives, "# User rules\n"); g_node_traverse(item->parent, G_IN_ORDER, G_TRAVERSE_LEAVES, -1, users_sudo_item, sudo_directives); + g_string_append(sudo_directives, "\n"); if (!write_sudo_directives(sudo_directives, "users-cloud-init")) { LOG(MOD "Cannot write sudo directives\n"); } diff --git a/src/main.c b/src/main.c index 32275ee..3488a75 100644 --- a/src/main.c +++ b/src/main.c @@ -134,9 +134,10 @@ bool async_setup_first_boot(gpointer data) { GString* sudo_directives = NULL; /* default user will be able to use sudo */ - sudo_directives = g_string_new(DEFAULT_USER_SUDO); + sudo_directives = g_string_new(""); + g_string_printf(sudo_directives, "# User rules for %s\n%s\n\n", DEFAULT_USER_USERNAME, DEFAULT_USER_SUDO); if (!write_sudo_directives(sudo_directives, DEFAULT_USER_USERNAME"-cloud-init")) { - LOG("Failed to enable sudo rule for user: %s\n", DEFAULT_USER_SUDO); + LOG("Failed to enable sudo rule for user: %s\n", DEFAULT_USER_USERNAME); } g_string_free(sudo_directives, true);