dirkmueller/systemd
SHA256
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Don't ship systemd-resolved for now (bsc#1024897)

Browse Source 
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/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 8077e4943a
commit 34b9ae1e78
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

14
systemd-mini.spec
View File

@ -33,19 +33,18 @@
%bcond_with machined
%bcond_with importd
%bcond_with networkd
%bcond_with resolved
%bcond_with journal_remote
%else
%bcond_without sysvcompat
%bcond_without machined
%bcond_without importd
%bcond_without networkd
%bcond_without resolved
%bcond_without journal_remote
%ifarch %{ix86} x86_64
%bcond_without gnuefi
%endif
%endif
%bcond_with resolved
%bcond_with parentpathid
Name: systemd-mini
@ -399,9 +398,6 @@ Some systemd commands offer bash completion, but it is an optional dependency.
%prep
%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
%if 0%{?bootstrap}
@ -543,9 +539,9 @@ rm -f %{buildroot}%{_prefix}/lib/systemd/system/systemd-journal-upload.*
# legacy links
for f in loginctl journalctl ; do
ln -s $f %{buildroot}%{_bindir}/systemd-$f
ln -s $f %{buildroot}%{_bindir}/systemd-$f
%if ! 0%{?bootstrap}
ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1
ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1
%endif
done
ln -s /usr/lib/udev %{buildroot}/lib/udev
@ -687,7 +683,7 @@ fi >/dev/null
# since v207 /etc/sysctl.conf is no longer parsed, however
# backward compatibility is provided by /etc/sysctl.d/99-sysctl.conf
if [ ! -L /etc/sysctl.d/99-sysctl.conf -a -e /etc/sysctl.conf ]; then
ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || :
ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || :
fi
# migrate any symlink which may refer to the old path
@ -764,7 +760,7 @@ fi >/dev/null
%pretrans -n udev%{?mini} -p <lua>
if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then
posix.symlink("/lib/udev", "/usr/lib/udev")
posix.symlink("/lib/udev", "/usr/lib/udev")
end
%pre -n udev%{?mini}

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

14
systemd.spec
View File

@ -31,19 +31,18 @@
%bcond_with machined
%bcond_with importd
%bcond_with networkd
%bcond_with resolved
%bcond_with journal_remote
%else
%bcond_without sysvcompat
%bcond_without machined
%bcond_without importd
%bcond_without networkd
%bcond_without resolved
%bcond_without journal_remote
%ifarch %{ix86} x86_64
%bcond_without gnuefi
%endif
%endif
%bcond_with resolved
%bcond_with parentpathid
Name: systemd
@ -397,9 +396,6 @@ Some systemd commands offer bash completion, but it is an optional dependency.
%prep
%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
%if 0%{?bootstrap}
@ -541,9 +537,9 @@ rm -f %{buildroot}%{_prefix}/lib/systemd/system/systemd-journal-upload.*
# legacy links
for f in loginctl journalctl ; do
ln -s $f %{buildroot}%{_bindir}/systemd-$f
ln -s $f %{buildroot}%{_bindir}/systemd-$f
%if ! 0%{?bootstrap}
ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1
ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1
%endif
done
ln -s /usr/lib/udev %{buildroot}/lib/udev
@ -685,7 +681,7 @@ fi >/dev/null
# since v207 /etc/sysctl.conf is no longer parsed, however
# backward compatibility is provided by /etc/sysctl.d/99-sysctl.conf
if [ ! -L /etc/sysctl.d/99-sysctl.conf -a -e /etc/sysctl.conf ]; then
ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || :
ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || :
fi
# migrate any symlink which may refer to the old path
@ -762,7 +758,7 @@ fi >/dev/null
%pretrans -n udev%{?mini} -p <lua>
if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then
posix.symlink("/lib/udev", "/usr/lib/udev")
posix.symlink("/lib/udev", "/usr/lib/udev")
end
%pre -n udev%{?mini}