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

Accepting request 459204 from home:fbui:systemd:Factory

Browse Source 
- Don't ship systemd-resolved for now (bsc#1024897)
  If resolved is enabled , systemd-tmpfiles creates a wrong symlink in
  /etc/resolv.conf which confuses the network manager actually used.

- More indentation cleanup (no functional changes)

OBS-URL: https://build.opensuse.org/request/show/459204
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=971
This commit is contained in:
Franck Bui 2017-02-20 11:40:16 +00:00 committed by Git OBS Bridge
parent 0f140c2631
commit 31a5909816
4 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
systemd-mini.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Feb 20 10:53:11 UTC 2017 - fbui@suse.com
- Don't ship systemd-resolved for now (bsc#1024897)
If resolved is enabled , systemd-tmpfiles creates a wrong symlink in
/etc/resolv.conf which confuses the network manager actually used.
-------------------------------------------------------------------
Thu Feb 9 14:06:46 UTC 2017 - fbui@suse.com
- More indentation cleanup (no functional changes)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 8 08:45:09 CET 2017 - kukuk@suse.de Wed Feb 8 08:45:09 CET 2017 - kukuk@suse.de

6
systemd-mini.spec
View File

@ -33,19 +33,18 @@
%bcond_with machined %bcond_with machined
%bcond_with importd %bcond_with importd
%bcond_with networkd %bcond_with networkd
%bcond_with resolved
%bcond_with journal_remote %bcond_with journal_remote
%else %else
%bcond_without sysvcompat %bcond_without sysvcompat
%bcond_without machined %bcond_without machined
%bcond_without importd %bcond_without importd
%bcond_without networkd %bcond_without networkd
%bcond_without resolved
%bcond_without journal_remote %bcond_without journal_remote
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
%bcond_without gnuefi %bcond_without gnuefi
%endif %endif
%endif %endif
%bcond_with resolved
%bcond_with parentpathid %bcond_with parentpathid
Name: systemd-mini Name: systemd-mini
@ -399,9 +398,6 @@ Some systemd commands offer bash completion, but it is an optional dependency.
%prep %prep
%setup -q -n systemd-%{version} %setup -q -n systemd-%{version}
echo "Checking whether upstream rpm macros changed..."
#skipped for now
#[ -z "`diff -Naru "%{S:10}" src/core/macros.systemd.in`" ] || exit 1
# only needed for bootstrap # only needed for bootstrap
%if 0%{?bootstrap} %if 0%{?bootstrap}

13
systemd.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Feb 20 10:53:11 UTC 2017 - fbui@suse.com
- Don't ship systemd-resolved for now (bsc#1024897)
If resolved is enabled , systemd-tmpfiles creates a wrong symlink in
/etc/resolv.conf which confuses the network manager actually used.
-------------------------------------------------------------------
Thu Feb 9 14:06:46 UTC 2017 - fbui@suse.com
- More indentation cleanup (no functional changes)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 8 08:45:09 CET 2017 - kukuk@suse.de Wed Feb 8 08:45:09 CET 2017 - kukuk@suse.de

6
systemd.spec
View File

@ -31,19 +31,18 @@
%bcond_with machined %bcond_with machined
%bcond_with importd %bcond_with importd
%bcond_with networkd %bcond_with networkd
%bcond_with resolved
%bcond_with journal_remote %bcond_with journal_remote
%else %else
%bcond_without sysvcompat %bcond_without sysvcompat
%bcond_without machined %bcond_without machined
%bcond_without importd %bcond_without importd
%bcond_without networkd %bcond_without networkd
%bcond_without resolved
%bcond_without journal_remote %bcond_without journal_remote
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
%bcond_without gnuefi %bcond_without gnuefi
%endif %endif
%endif %endif
%bcond_with resolved
%bcond_with parentpathid %bcond_with parentpathid
Name: systemd Name: systemd
@ -397,9 +396,6 @@ Some systemd commands offer bash completion, but it is an optional dependency.
%prep %prep
%setup -q -n systemd-%{version} %setup -q -n systemd-%{version}
echo "Checking whether upstream rpm macros changed..."
#skipped for now
#[ -z "`diff -Naru "%{S:10}" src/core/macros.systemd.in`" ] || exit 1
# only needed for bootstrap # only needed for bootstrap
%if 0%{?bootstrap} %if 0%{?bootstrap}