folkslinux
/
CBL-Mariner
mirror of https://github.com/microsoft/CBL-Mariner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #69 from lpereira/use-time-windows-com-timesyncd 

Use time.windows.com for systemd-timesyncd by default
This commit is contained in:
jslobodzian 2020-08-24 16:37:41 -07:00 committed by GitHub
parent d40773cd31 41807e7118
commit a24b6556b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SPECS/systemd/systemd.spec
View File

@ -1,7 +1,7 @@
Summary: Systemd-239 Summary: Systemd-239
Name: systemd Name: systemd
Version: 239 Version: 239
Release: 30%{?dist} Release: 31%{?dist}
License: LGPLv2+ and GPLv2+ and MIT License: LGPLv2+ and GPLv2+ and MIT
URL: https://www.freedesktop.org/wiki/Software/systemd/ URL: https://www.freedesktop.org/wiki/Software/systemd/
Group: System Environment/Security Group: System Environment/Security
@ -153,6 +153,7 @@ sed -i '/srv/d' %{buildroot}/usr/lib/tmpfiles.d/home.conf
sed -i "s:0775 root lock:0755 root root:g" %{buildroot}/usr/lib/tmpfiles.d/legacy.conf sed -i "s:0775 root lock:0755 root root:g" %{buildroot}/usr/lib/tmpfiles.d/legacy.conf
sed -i "s:NamePolicy=kernel database onboard slot path:NamePolicy=kernel database:g" %{buildroot}/lib/systemd/network/99-default.link sed -i "s:NamePolicy=kernel database onboard slot path:NamePolicy=kernel database:g" %{buildroot}/lib/systemd/network/99-default.link
sed -i "s:#LLMNR=yes:LLMNR=false:g" %{buildroot}/etc/systemd/resolved.conf sed -i "s:#LLMNR=yes:LLMNR=false:g" %{buildroot}/etc/systemd/resolved.conf
sed -i "s:#NTP=:NTP=time.windows.com:g" %{buildroot}/etc/systemd/timesyncd.conf
rm -f %{buildroot}%{_var}/log/README rm -f %{buildroot}%{_var}/log/README
mkdir -p %{buildroot}%{_localstatedir}/opt/journal/log mkdir -p %{buildroot}%{_localstatedir}/opt/journal/log
mkdir -p %{buildroot}%{_localstatedir}/log mkdir -p %{buildroot}%{_localstatedir}/log
@ -270,6 +271,8 @@ rm -rf %{buildroot}/*
%files lang -f %{name}.lang %files lang -f %{name}.lang
%changelog %changelog
* Mon Aug 24 2020 Leandro Pereira <leperei@microsoft.com> 239-31
- Use time.windows.com as the default NTP server in timesyncd.
* Tue Aug 11 2020 Mateusz Malisz <mamalisz@microsoft.com> 239-30 * Tue Aug 11 2020 Mateusz Malisz <mamalisz@microsoft.com> 239-30
- Reduce kptr_restrict to 1 - Reduce kptr_restrict to 1
* Fri May 29 2020 Nicolas Ontiveros <niontive@microsoft.com> 239-29 * Fri May 29 2020 Nicolas Ontiveros <niontive@microsoft.com> 239-29

8
toolkit/resources/manifests/package/toolchain_aarch64.txt
View File

@ -350,13 +350,13 @@ sqlite-devel-3.32.3-1.cm1.aarch64.rpm
sqlite-libs-3.32.3-1.cm1.aarch64.rpm sqlite-libs-3.32.3-1.cm1.aarch64.rpm
swig-3.0.12-4.cm1.aarch64.rpm swig-3.0.12-4.cm1.aarch64.rpm
swig-debuginfo-3.0.12-4.cm1.aarch64.rpm swig-debuginfo-3.0.12-4.cm1.aarch64.rpm
systemd-239-30.cm1.aarch64.rpm systemd-239-31.cm1.aarch64.rpm
systemd-bootstrap-239-29.cm1.aarch64.rpm systemd-bootstrap-239-29.cm1.aarch64.rpm
systemd-bootstrap-debuginfo-239-29.cm1.aarch64.rpm systemd-bootstrap-debuginfo-239-29.cm1.aarch64.rpm
systemd-bootstrap-devel-239-29.cm1.aarch64.rpm systemd-bootstrap-devel-239-29.cm1.aarch64.rpm
systemd-debuginfo-239-30.cm1.aarch64.rpm systemd-debuginfo-239-31.cm1.aarch64.rpm
systemd-devel-239-30.cm1.aarch64.rpm systemd-devel-239-31.cm1.aarch64.rpm
systemd-lang-239-30.cm1.aarch64.rpm systemd-lang-239-31.cm1.aarch64.rpm
tar-1.32-2.cm1.aarch64.rpm tar-1.32-2.cm1.aarch64.rpm
tar-debuginfo-1.32-2.cm1.aarch64.rpm tar-debuginfo-1.32-2.cm1.aarch64.rpm
tdnf-2.1.0-4.cm1.aarch64.rpm tdnf-2.1.0-4.cm1.aarch64.rpm

8
toolkit/resources/manifests/package/toolchain_x86_64.txt
View File

@ -350,13 +350,13 @@ sqlite-devel-3.32.3-1.cm1.x86_64.rpm
sqlite-libs-3.32.3-1.cm1.x86_64.rpm sqlite-libs-3.32.3-1.cm1.x86_64.rpm
swig-3.0.12-4.cm1.x86_64.rpm swig-3.0.12-4.cm1.x86_64.rpm
swig-debuginfo-3.0.12-4.cm1.x86_64.rpm swig-debuginfo-3.0.12-4.cm1.x86_64.rpm
systemd-239-30.cm1.x86_64.rpm systemd-239-31.cm1.x86_64.rpm
systemd-bootstrap-239-29.cm1.x86_64.rpm systemd-bootstrap-239-29.cm1.x86_64.rpm
systemd-bootstrap-debuginfo-239-29.cm1.x86_64.rpm systemd-bootstrap-debuginfo-239-29.cm1.x86_64.rpm
systemd-bootstrap-devel-239-29.cm1.x86_64.rpm systemd-bootstrap-devel-239-29.cm1.x86_64.rpm
systemd-debuginfo-239-30.cm1.x86_64.rpm systemd-debuginfo-239-31.cm1.x86_64.rpm
systemd-devel-239-30.cm1.x86_64.rpm systemd-devel-239-31.cm1.x86_64.rpm
systemd-lang-239-30.cm1.x86_64.rpm systemd-lang-239-31.cm1.x86_64.rpm
tar-1.32-2.cm1.x86_64.rpm tar-1.32-2.cm1.x86_64.rpm
tar-debuginfo-1.32-2.cm1.x86_64.rpm tar-debuginfo-1.32-2.cm1.x86_64.rpm
tdnf-2.1.0-4.cm1.x86_64.rpm tdnf-2.1.0-4.cm1.x86_64.rpm