rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 319468 from home:msmeissn:branches:Base:System

Browse Source 
- hostname-NULL.patch: Work around a crash on XEN hosts
  in OBS. /etc/hostname is not present and systemd then does
  strchr(hostname,soemthing) with hostname NULL.

- hostname-NULL.patch: Work around a crash on XEN hosts
  in OBS. /etc/hostname is not present and systemd then does
  strchr(hostname,soemthing) with hostname NULL.

OBS-URL: https://build.opensuse.org/request/show/319468
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=888
This commit is contained in:
Marcus Meissner 2015-07-30 06:19:43 +00:00 committed by Git OBS Bridge
parent 092da2ec27
commit 8b1e73ecdb
5 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hostname-NULL.patch Normal file
View File

@ -0,0 +1,13 @@
Index: systemd-222/src/core/hostname-setup.c
===================================================================
--- systemd-222.orig/src/core/hostname-setup.c
+++ systemd-222/src/core/hostname-setup.c
@@ -44,7 +44,7 @@ int hostname_setup(void) {
else
log_warning_errno(r, "Failed to read configured hostname: %m");
- hn = NULL;
+ hn = strdup("nohostname.set.site");
} else
hn = b;
/* strip any leftover of a domain name */

7
systemd-mini.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jul 29 18:10:53 UTC 2015 - meissner@suse.com
- hostname-NULL.patch: Work around a crash on XEN hosts
in OBS. /etc/hostname is not present and systemd then does
strchr(hostname,soemthing) with hostname NULL.
-------------------------------------------------------------------
Wed Jul 29 09:02:21 UTC 2015 - werner@suse.de

3
systemd-mini.spec
View File

@ -291,6 +291,8 @@ Patch1096: 1096-new-udev-root-symlink-generator.patch
Patch1097: 1097-udevd-increase-maximum-number-of-children.patch
# PATCH-FIX-OPENSUSE 1098-systemd-networkd-alias-network-service.patch
Patch1098: 1098-systemd-networkd-alias-network-service.patch
# PATCH-FIX-OPENSUSE hostname-NULL.patch - fix crash on xen build hosts in OBS Marcus Meissner
Patch1099: hostname-NULL.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -614,6 +616,7 @@ cp %{SOURCE7} m4/
%patch1096 -p1
%patch1097 -p1
%patch1098 -p1
%patch1099 -p1
# remove patch backups
find -name '*.orig' -exec rm -f '{}' \+

7
systemd.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jul 29 18:10:53 UTC 2015 - meissner@suse.com
- hostname-NULL.patch: Work around a crash on XEN hosts
in OBS. /etc/hostname is not present and systemd then does
strchr(hostname,soemthing) with hostname NULL.
-------------------------------------------------------------------
Wed Jul 29 09:02:21 UTC 2015 - werner@suse.de

3
systemd.spec
View File

@ -286,6 +286,8 @@ Patch1096: 1096-new-udev-root-symlink-generator.patch
Patch1097: 1097-udevd-increase-maximum-number-of-children.patch
# PATCH-FIX-OPENSUSE 1098-systemd-networkd-alias-network-service.patch
Patch1098: 1098-systemd-networkd-alias-network-service.patch
# PATCH-FIX-OPENSUSE hostname-NULL.patch - fix crash on xen build hosts in OBS Marcus Meissner
Patch1099: hostname-NULL.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -609,6 +611,7 @@ cp %{SOURCE7} m4/
%patch1096 -p1
%patch1097 -p1
%patch1098 -p1
%patch1099 -p1
# remove patch backups
find -name '*.orig' -exec rm -f '{}' \+