diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-06 16:41:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-06 16:41:34 -0400 |
| commit | a75bfac699bdc238eedc78dcdb0ee3ce533cd854 (patch) | |
| tree | 3c7d4a456920dc1191998a235f6957a772a9963d /src/core | |
| parent | 3384b776817808f01979ce192603d0c901391fd4 (diff) | |
| parent | 98cad0ba37f0123763df77c3f51a6a222026d08b (diff) | |
Merge tag 'systemd/v232-6.parabola1'systemd/v232-8.parabola2
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/execute.c | 4 | ||||
| -rw-r--r-- | src/core/main.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/execute.c b/src/core/execute.c index f13ca30395..85ee82c3e1 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1254,6 +1254,10 @@ static int apply_address_families(const Unit* u, const ExecContext *c) { Iterator i; int r; +#if defined(__i386__) + return 0; +#endif + assert(c); if (skip_seccomp_unavailable(u, "RestrictAddressFamilies=")) diff --git a/src/core/main.c b/src/core/main.c index 94602611a7..f07ed71b31 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1246,11 +1246,11 @@ static int status_welcome(void) { return status_printf(NULL, false, false, "\nWelcome to \x1B[%sm%s\x1B[0m!\n", isempty(ansi_color) ? "1" : ansi_color, - isempty(pretty_name) ? "Linux" : pretty_name); + isempty(pretty_name) ? "GNU/Linux" : pretty_name); else return status_printf(NULL, false, false, "\nWelcome to %s!\n", - isempty(pretty_name) ? "Linux" : pretty_name); + isempty(pretty_name) ? "GNU/Linux" : pretty_name); } static int write_container_id(void) { |