src/shared: import upstream code needed for recent commits

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

2 files changed, 3 insertions, 7 deletions

diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
index aaf94262a8..1d2e7dd5d6 100644
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -76,7 +76,7 @@ static int adm_help(struct udev *udev, int argc, char *argv[]) {
 static int run_command(struct udev *udev, const struct udevadm_cmd *cmd, int argc, char *argv[]) {
         if (cmd->debug)
                 log_set_max_level(LOG_DEBUG);
-        log_debug("calling: %s\n", cmd->name);
+        log_debug("calling: %s", cmd->name);
         return cmd->cmd(udev, argc, argv);
 }
 
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 5b0db0a0b1..cd94724f54 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1060,6 +1060,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "version",            no_argument,            NULL, 'V' },
                 {}
         };
+
         int c;
 
         assert(argc >= 0);
@@ -1068,7 +1069,6 @@ static int parse_argv(int argc, char *argv[]) {
         while ((c = getopt_long(argc, argv, "c:de:DtN:hV", options, NULL)) >= 0) {
                 int r;
 
-
                 switch (c) {
 
                 case 'd':
@@ -1138,7 +1138,6 @@ int main(int argc, char *argv[]) {
                 goto exit;
 
         log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
         log_open();
 
         udev_set_log_fn(udev, udev_main_log);
@@ -1163,10 +1162,7 @@ int main(int argc, char *argv[]) {
         label_init("/dev");
 
         /* set umask before creating any file/directory */
-        if(chdir("/")!= 0) {
-                log_error("unable to change into directory '/'");
-                goto exit;
-        }
+        chdir("/");
         umask(022);
 
         mkdir("/run/udev", 0755);