ad868e1c6b
See https://github.com/openSUSE/systemd/blob/SUSE/v249/NEWS for details. - Rebased 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1177
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From c6ed74889adade0287ee609150611544d8d5c6d2 Mon Sep 17 00:00:00 2001
|
|
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Tue, 28 May 2013 15:17:35 +0200
|
|
Subject: [PATCH 04/11] strip the domain part from /etc/hostname when setting
|
|
system host name
|
|
|
|
[fbui: fixes bnc#820213]
|
|
[fbui: forwardported from bfd2462b8ddec591d953841ab22bb30bdc6f9085]
|
|
[fbui: adjust context and make sure that strip of the domain name is
|
|
only done when setting the system host name. Therefore it's
|
|
still possible to pass an FQDN to hostnamectl]
|
|
[fbui: I'm still not sure that it was the right thing to do. Other
|
|
possibility was to fix the installer to create a correct
|
|
/etc/hostname file. Need to investigate...]
|
|
---
|
|
src/shared/hostname-setup.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/src/shared/hostname-setup.c b/src/shared/hostname-setup.c
|
|
index 511aa7d031..351d0e761d 100644
|
|
--- a/src/shared/hostname-setup.c
|
|
+++ b/src/shared/hostname-setup.c
|
|
@@ -189,6 +189,13 @@ int hostname_setup(bool really) {
|
|
else
|
|
log_warning_errno(r, "Failed to read configured hostname: %m");
|
|
} else {
|
|
+ char *domain;
|
|
+
|
|
+ /* SUSE: strip the domain name */
|
|
+ domain = strchr(b, '.');
|
|
+ if (domain)
|
|
+ *domain = '\0';
|
|
+
|
|
hn = b;
|
|
source = HOSTNAME_STATIC;
|
|
}
|
|
--
|
|
2.26.2
|
|
|