X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Futil.c;h=2c7b1f9a56bd4cd7ae0f83619668a49eaeba4cbe;hp=d769d60986f136d628d0eb0cfac21c3f9c478a35;hb=71656790d6540f817661cc22b8bc1d33720ce96a;hpb=c8bffa43fda412fa23bcf2b317a2bbfdf51f6473 diff --git a/src/util.c b/src/util.c index d769d6098..2c7b1f9a5 100644 --- a/src/util.c +++ b/src/util.c @@ -3079,13 +3079,6 @@ void status_welcome(void) { if (!ansi_color) const_color = "0;33"; /* Orange/Brown for Ubuntu */ -#elif defined(TARGET_ARCH) - - if (!pretty_name) - const_pretty = "Arch Linux"; - - if (!ansi_color) - const_color = "1;36"; /* Cyan for Arch */ #endif if (!pretty_name && !const_pretty) @@ -3386,6 +3379,8 @@ int wait_for_terminate_and_warn(const char *name, pid_t pid) { } void freeze(void) { + sync(); + for (;;) pause(); } @@ -3402,8 +3397,8 @@ bool null_or_empty(struct stat *st) { return false; } -DIR *xopendirat(int fd, const char *name) { - return fdopendir(openat(fd, name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)); +DIR *xopendirat(int fd, const char *name, int flags) { + return fdopendir(openat(fd, name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|flags)); } int signal_from_string_try_harder(const char *s) {