From ad0f699ff2bfc2842131c2cb315df765d59c619d Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 16 Mar 2015 12:17:44 -0700 Subject: [PATCH 1/2] systemd: split 219 ebuild from live ebuild No changes. --- .../sys-apps/systemd/systemd-219.ebuild | 572 +++++++++++++++++- 1 file changed, 571 insertions(+), 1 deletion(-) mode change 120000 => 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219.ebuild deleted file mode 120000 index 8da16946bc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219.ebuild +++ /dev/null @@ -1 +0,0 @@ -systemd-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219.ebuild new file mode 100644 index 0000000000..1bd4640eb7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219.ebuild @@ -0,0 +1,571 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.160 2015/02/20 16:13:22 floppym Exp $ + +EAPI=5 + +if [[ ${PV} == 9999 ]]; then +AUTOTOOLS_AUTORECONF=yes +EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN} + http://cgit.freedesktop.org/${PN}/${PN}/" + +inherit git-r3 + +elif [[ ${PV} == *9999 ]]; then +AUTOTOOLS_AUTORECONF=yes +EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN}-stable + http://cgit.freedesktop.org/${PN}/${PN}-stable/" +EGIT_BRANCH=v${PV%%.*}-stable + +inherit git-r3 +fi + +AUTOTOOLS_AUTORECONF=yes +AUTOTOOLS_PRUNE_LIBTOOL_FILES=all +PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) +inherit autotools-utils bash-completion-r1 linux-info multilib \ + multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \ + user + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" +SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0/2" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http + idn importd introspection kdbus +kmod +lz4 lzma nat pam policykit python + qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb" + +# Gentoo removed the nls use flag, we'll keep it for now +IUSE+=" nls symlink-usr" + +REQUIRED_USE="importd? ( curl gcrypt lzma )" + +MINKV="3.8" + +COMMON_DEPEND=">=sys-apps/util-linux-2.25:0= + sys-libs/libcap:0= + acl? ( sys-apps/acl:0= ) + apparmor? ( sys-libs/libapparmor:0= ) + audit? ( >=sys-process/audit-2:0= ) + cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) + curl? ( net-misc/curl:0= ) + elfutils? ( >=dev-libs/elfutils-0.158:0= ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) + gudev? ( >=dev-libs/glib-2.34.3:2=[${MULTILIB_USEDEP}] ) + http? ( + >=net-libs/libmicrohttpd-0.9.33:0= + ssl? ( >=net-libs/gnutls-3.1.4:0= ) + ) + idn? ( net-dns/libidn:0= ) + importd? ( + app-arch/bzip2:0= + sys-libs/zlib:0= + ) + introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) + kmod? ( >=sys-apps/kmod-15:0= ) + lz4? ( >=app-arch/lz4-0_p119:0=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) + nat? ( net-firewall/iptables:0= ) + pam? ( virtual/pam:= ) + python? ( ${PYTHON_DEPS} ) + qrcode? ( media-gfx/qrencode:0= ) + seccomp? ( sys-libs/libseccomp:0= ) + selinux? ( sys-libs/libselinux:0= ) + sysv-utils? ( + !sys-apps/systemd-sysv-utils + !sys-apps/sysvinit ) + terminal? ( >=dev-libs/libevdev-1.2:0= + >=x11-libs/libxkbcommon-0.5:0= + >=x11-libs/libdrm-2.4:0= ) + xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" + +# baselayout-2.2 has /run +RDEPEND="${COMMON_DEPEND} + >=sys-apps/baselayout-2.2 + !sys-auth/nss-myhostname + !=sys-apps/dbus-1.8.8 if/when this is dropped. + local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc ) + emake "${mymakeopts[@]}" install-pkgconfiglibDATA \ + pkgconfiglib_DATA="${pcfiles[*]}" +} + +multilib_src_install_all() { + prune_libtool_files --modules + einstalldocs + + if use sysv-utils; then + local prefix + use symlink-usr && prefix=/usr + for app in halt poweroff reboot runlevel shutdown telinit; do + dosym "/${ROOTPREFIX-/usr}/bin/systemctl" ${prefix}/sbin/${app} + done + dosym "/${ROOTPREFIX-/usr}/lib/systemd/systemd" ${prefix}/sbin/init + else + # we just keep sysvinit tools, so no need for the mans + rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ + || die + rm "${D}"/usr/share/man/man1/init.1 || die + fi + + # Ensure journal directory has correct ownership/mode in inital image. + # This is fixed by systemd-tmpfiles *but* journald starts before that + # and will create the journal if the filesystem is already read-write. + # Conveniently the systemd Makefile sets this up completely wrong. + dodir /var/log/journal + fowners root:systemd-journal /var/log/journal + fperms 2755 /var/log/journal + + systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf + systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf + + # Don't default to graphical.target + rm "${D}"/usr/lib/systemd/system/default.target || die + dosym multi-user.target /usr/lib/systemd/system/default.target + + # If we install these symlinks, there is no way for the sysadmin to remove them + # permanently. + rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die + rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die + rm -r "${D}"/etc/systemd/system/network-online.target.wants || die + rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die + + # Move a few services enabled in /etc to /usr + # systemd-timesyncd is left disabled, we currently use ntpd + rm -f "${D}"/etc/systemd/system/getty.target.wants/getty@tty1.service + rm -f "${D}"/etc/systemd/system/multi-user.target.wants/remote-fs.target + + rm -f "${D}"/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service + rmdir "${D}"/etc/systemd/system/getty.target.wants \ + "${D}"/etc/systemd/system/multi-user.target.wants \ + || die + + dosym ../getty@.service /usr/lib/systemd/system/getty.target.wants/getty@tty1.service + systemd_enable_service multi-user.target remote-fs.target + systemd_enable_service multi-user.target systemd-networkd.service + systemd_enable_service multi-user.target systemd-resolved.service + systemd_enable_service network-online.target systemd-networkd-wait-online.service + + # Grant networkd access to set the transient host name + insinto /usr/share/polkit-1/rules.d + doins "${FILESDIR}"/99-org.freedesktop.hostname1.rules + + # Do not enable random services if /etc was detected as empty!!! + rm "${D}"/usr/lib/systemd/system-preset/90-systemd.preset + insinto /usr/lib/systemd/system-preset + doins "${FILESDIR}"/99-default.preset + + # Disable the "First Boot Wizard" by default, it isn't very applicable to CoreOS + rm "${D}"/usr/lib/systemd/system/sysinit.target.wants/systemd-firstboot.service + + # Do not ship distro-specific files (nsswitch.conf pam.d) + rm -rf "${D}"/usr/share/factory + sed -i "${D}"/usr/lib/tmpfiles.d/etc.conf \ + -e '/^C \/etc\/nsswitch\.conf/d' \ + -e '/^C \/etc\/pam\.d/d' +} + +migrate_locale() { + local envd_locale_def="${EROOT%/}/etc/env.d/02locale" + local envd_locale=( "${EROOT%/}"/etc/env.d/??locale ) + local locale_conf="${EROOT%/}/etc/locale.conf" + + if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then + # If locale.conf does not exist... + if [[ -e ${envd_locale} ]]; then + # ...either copy env.d/??locale if there's one + ebegin "Moving ${envd_locale} to ${locale_conf}" + mv "${envd_locale}" "${locale_conf}" + eend ${?} || FAIL=1 + else + # ...or create a dummy default + ebegin "Creating ${locale_conf}" + cat > "${locale_conf}" <<-EOF + # This file has been created by the sys-apps/systemd ebuild. + # See locale.conf(5) and localectl(1). + + # LANG=${LANG} + EOF + eend ${?} || FAIL=1 + fi + fi + + if [[ ! -L ${envd_locale} ]]; then + # now, if env.d/??locale is not a symlink (to locale.conf)... + if [[ -e ${envd_locale} ]]; then + # ...warn the user that he has duplicate locale settings + ewarn + ewarn "To ensure consistent behavior, you should replace ${envd_locale}" + ewarn "with a symlink to ${locale_conf}. Please migrate your settings" + ewarn "and create the symlink with the following command:" + ewarn "ln -s -n -f ../locale.conf ${envd_locale}" + ewarn + else + # ...or just create the symlink if there's nothing here + ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" + ln -n -s ../locale.conf "${envd_locale_def}" + eend ${?} || FAIL=1 + fi + fi +} + +migrate_net_name_slot() { + # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, + # do the same for 80-net-setup-link.rules to keep the old behavior + local net_move=no + local net_name_slot_sym=no + local net_rules_path="${EROOT%/}"/etc/udev/rules.d + local net_name_slot="${net_rules_path}"/80-net-name-slot.rules + local net_setup_link="${net_rules_path}"/80-net-setup-link.rules + if [[ -e ${net_setup_link} ]]; then + net_move=no + elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then + net_move=yes + elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then + net_move=yes + net_name_slot_sym=yes + fi + if [[ ${net_move} == yes ]]; then + ebegin "Copying ${net_name_slot} to ${net_setup_link}" + + if [[ ${net_name_slot_sym} == yes ]]; then + ln -nfs /dev/null "${net_setup_link}" + else + cp "${net_name_slot}" "${net_setup_link}" + fi + eend $? || FAIL=1 + fi +} + +pkg_postinst() { + newusergroup() { + enewgroup "$1" + enewuser "$1" -1 -1 -1 "$1" + } + + enewgroup input + enewgroup systemd-journal + newusergroup systemd-bus-proxy + newusergroup systemd-journal-gateway + newusergroup systemd-journal-remote + newusergroup systemd-journal-upload + newusergroup systemd-network + newusergroup systemd-resolve + newusergroup systemd-timesync + use http && newusergroup systemd-journal-gateway + + systemd_update_catalog + + # Keep this here in case the database format changes so it gets updated + # when required. Despite that this file is owned by sys-apps/hwids. + if has_version "sys-apps/hwids[udev]"; then + udevadm hwdb --update --root="${ROOT%/}" + fi + + udev_reload || FAIL=1 + + # Bug 465468, make sure locales are respect, and ensure consistency + # between OpenRC & systemd + migrate_locale + + # Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules + migrate_net_name_slot + + if [[ ${FAIL} ]]; then + eerror "One of the postinst commands failed. Please check the postinst output" + eerror "for errors. You may need to clean up your system and/or try installing" + eerror "systemd again." + eerror + fi + + if [[ ! -L "${ROOT}"/etc/mtab ]]; then + ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts." + ewarn "Not having it is not supported by upstream and will cause tools like 'df'" + ewarn "and 'mount' to not work properly. Please run:" + ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" + ewarn + fi + + if [[ $(readlink "${ROOT}"/etc/resolv.conf) == */run/systemd/network/resolv.conf ]]; then + ewarn "resolv.conf is now generated by systemd-resolved. To use it, enable" + ewarn "systemd-resolved.service, and create a symlink from /etc/resolv.conf" + ewarn "to /run/systemd/resolve/resolv.conf" + ewarn + fi + + if ! has_version sys-apps/systemd-ui; then + elog "To get additional features, a number of optional runtime dependencies may" + elog "be installed:" + elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent" + fi + + if has_version sys-apps/openrc && + ! has_version sys-fs/udev-init-scripts; then + elog "If you plan to boot using OpenRC and udev or eudev, you" + elog "need to install the udev-init-scripts package." + fi +} + +pkg_prerm() { + # If removing systemd completely, remove the catalog database. + if [[ ! ${REPLACED_BY_VERSION} ]]; then + rm -f -v "${EROOT}"/var/lib/systemd/catalog/database + fi +} From 8e9514d85cdd4bdd13ac0e0099759194aeadea8c Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 12 Mar 2015 18:39:13 -0700 Subject: [PATCH 2/2] systemd: add UseNTP DHCP option, allow timesyncd in VMs These are two important prerequisites for eventually switching from ntpd to timesyncd as our default ntp service. --- ...enable-timesyncd-in-virtual-machines.patch | 39 ++++++++++++++++ ...-0005-network-add-UseNTP-DHCP-option.patch | 46 +++++++++++++++++++ ...enable-timesyncd-in-virtual-machines.patch | 39 ++++++++++++++++ ...-0002-network-add-UseNTP-DHCP-option.patch | 46 +++++++++++++++++++ ...md-218-r5.ebuild => systemd-218-r6.ebuild} | 4 ++ ...stemd-219.ebuild => systemd-219-r1.ebuild} | 4 ++ 6 files changed, 178 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/218-0004-timesyncd-enable-timesyncd-in-virtual-machines.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/218-0005-network-add-UseNTP-DHCP-option.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/219-0001-timesyncd-enable-timesyncd-in-virtual-machines.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/219-0002-network-add-UseNTP-DHCP-option.patch rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-218-r5.ebuild => systemd-218-r6.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-219.ebuild => systemd-219-r1.ebuild} (98%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/218-0004-timesyncd-enable-timesyncd-in-virtual-machines.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/218-0004-timesyncd-enable-timesyncd-in-virtual-machines.patch new file mode 100644 index 0000000000..f019ac656c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/218-0004-timesyncd-enable-timesyncd-in-virtual-machines.patch @@ -0,0 +1,39 @@ +From 48a6d639f867ba5b96ff22edce6a297cdace9cf9 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Sun, 15 Mar 2015 19:44:59 +0100 +Subject: [PATCH 4/5] timesyncd: enable timesyncd in virtual machines + +On Fri, Mar 13, 2015 at 8:25 PM, Michael Marineau wrote: +> Currently systemd-timesyncd.service includes +> ConditionVirtualization=no, disabling it in both containers and +> virtual machines. Each VM platform tends to deal with or ignore the +> time problem in their own special ways, KVM/QEMU has the kernel time +> source kvm-clock, Xen has had different schemes over the years, VMware +> expects a userspace daemon sync the clock, and other platforms are +> content to drift with the wind as far as I can tell. +> +> I don't know of a robust way to know if a platform needs a little +> extra help from userspace to keep the clock sane or not but it seems +> generally safer to try than to risk drifting. Does anyone know of a +> reason to leave timesyncd off by default? Otherwise switching to +> ConditionVirtualization=!container should be reasonable. +--- + units/systemd-timesyncd.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in +index 39edafc..8219c95 100644 +--- a/units/systemd-timesyncd.service.in ++++ b/units/systemd-timesyncd.service.in +@@ -9,7 +9,7 @@ + Description=Network Time Synchronization + Documentation=man:systemd-timesyncd.service(8) + ConditionCapability=CAP_SYS_TIME +-ConditionVirtualization=no ++ConditionVirtualization=!container + DefaultDependencies=no + RequiresMountsFor=/var/lib/systemd/clock + After=systemd-remount-fs.service systemd-tmpfiles-setup.service systemd-sysusers.service +-- +2.0.5 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/218-0005-network-add-UseNTP-DHCP-option.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/218-0005-network-add-UseNTP-DHCP-option.patch new file mode 100644 index 0000000000..7c0a616f87 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/218-0005-network-add-UseNTP-DHCP-option.patch @@ -0,0 +1,46 @@ +From 5aabe1661ded65cf5231a213cbf161a09b603207 Mon Sep 17 00:00:00 2001 +From: Michael Marineau +Date: Fri, 13 Mar 2015 12:01:29 -0700 +Subject: [PATCH 5/5] network: add UseNTP DHCP option + +Despite having the internal logic in place to enable/disable using NTP +servers provided by DHCP the network config didn't expose the option. +--- + man/systemd.network.xml | 8 ++++++++ + src/network/networkd-network-gperf.gperf | 1 + + 2 files changed, 9 insertions(+) + +diff --git a/man/systemd.network.xml b/man/systemd.network.xml +index 79c7a23..1897657 100644 +--- a/man/systemd.network.xml ++++ b/man/systemd.network.xml +@@ -468,6 +468,14 @@ + + + ++ UseNTP= ++ ++ When true (the default), the NTP servers received ++ from the DHCP server will be used by systemd-timesyncd ++ and take precedence over any statically configured ones. ++ ++ ++ + UseMTU= + + When true, the interface maximum transmission unit from the DHCP server will +diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf +index 640a3a2..8c1f552 100644 +--- a/src/network/networkd-network-gperf.gperf ++++ b/src/network/networkd-network-gperf.gperf +@@ -52,6 +52,7 @@ Route.Destination, config_parse_destination, 0, + Route.Source, config_parse_destination, 0, 0 + Route.Metric, config_parse_route_priority, 0, 0 + DHCP.UseDNS, config_parse_bool, 0, offsetof(Network, dhcp_dns) ++DHCP.UseNTP, config_parse_bool, 0, offsetof(Network, dhcp_ntp) + DHCP.UseMTU, config_parse_bool, 0, offsetof(Network, dhcp_mtu) + DHCP.UseHostname, config_parse_bool, 0, offsetof(Network, dhcp_hostname) + DHCP.UseDomains, config_parse_bool, 0, offsetof(Network, dhcp_domains) +-- +2.0.5 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/219-0001-timesyncd-enable-timesyncd-in-virtual-machines.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/219-0001-timesyncd-enable-timesyncd-in-virtual-machines.patch new file mode 100644 index 0000000000..ab4c4bc192 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/219-0001-timesyncd-enable-timesyncd-in-virtual-machines.patch @@ -0,0 +1,39 @@ +From 4b16233e59b3edd8338819dad275cc94b5e5f6e7 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Sun, 15 Mar 2015 19:44:59 +0100 +Subject: [PATCH] timesyncd: enable timesyncd in virtual machines + +On Fri, Mar 13, 2015 at 8:25 PM, Michael Marineau wrote: +> Currently systemd-timesyncd.service includes +> ConditionVirtualization=no, disabling it in both containers and +> virtual machines. Each VM platform tends to deal with or ignore the +> time problem in their own special ways, KVM/QEMU has the kernel time +> source kvm-clock, Xen has had different schemes over the years, VMware +> expects a userspace daemon sync the clock, and other platforms are +> content to drift with the wind as far as I can tell. +> +> I don't know of a robust way to know if a platform needs a little +> extra help from userspace to keep the clock sane or not but it seems +> generally safer to try than to risk drifting. Does anyone know of a +> reason to leave timesyncd off by default? Otherwise switching to +> ConditionVirtualization=!container should be reasonable. +--- + units/systemd-timesyncd.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in +index 39edafc..8219c95 100644 +--- a/units/systemd-timesyncd.service.in ++++ b/units/systemd-timesyncd.service.in +@@ -9,7 +9,7 @@ + Description=Network Time Synchronization + Documentation=man:systemd-timesyncd.service(8) + ConditionCapability=CAP_SYS_TIME +-ConditionVirtualization=no ++ConditionVirtualization=!container + DefaultDependencies=no + RequiresMountsFor=/var/lib/systemd/clock + After=systemd-remount-fs.service systemd-tmpfiles-setup.service systemd-sysusers.service +-- +2.0.5 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/219-0002-network-add-UseNTP-DHCP-option.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/219-0002-network-add-UseNTP-DHCP-option.patch new file mode 100644 index 0000000000..c3b10aa0bc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/219-0002-network-add-UseNTP-DHCP-option.patch @@ -0,0 +1,46 @@ +From 301f4073fe1c2757e602aef24cee9ccf5f81a3a3 Mon Sep 17 00:00:00 2001 +From: Michael Marineau +Date: Fri, 13 Mar 2015 12:01:29 -0700 +Subject: [PATCH] network: add UseNTP DHCP option + +Despite having the internal logic in place to enable/disable using NTP +servers provided by DHCP the network config didn't expose the option. +--- + man/systemd.network.xml | 8 ++++++++ + src/network/networkd-network-gperf.gperf | 1 + + 2 files changed, 9 insertions(+) + +diff --git a/man/systemd.network.xml b/man/systemd.network.xml +index ed0b2eb..087e9e2 100644 +--- a/man/systemd.network.xml ++++ b/man/systemd.network.xml +@@ -515,6 +515,14 @@ + + + ++ UseNTP= ++ ++ When true (the default), the NTP servers received ++ from the DHCP server will be used by systemd-timesyncd ++ and take precedence over any statically configured ones. ++ ++ ++ + UseMTU= + + When true, the interface maximum transmission unit +diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf +index 93df83a..8abf5bc 100644 +--- a/src/network/networkd-network-gperf.gperf ++++ b/src/network/networkd-network-gperf.gperf +@@ -60,6 +60,7 @@ Route.Metric, config_parse_route_priority, 0, + Route.Scope, config_parse_route_scope, 0, 0 + DHCP.ClientIdentifier, config_parse_dhcp_client_identifier,0, offsetof(Network, dhcp_client_identifier) + DHCP.UseDNS, config_parse_bool, 0, offsetof(Network, dhcp_dns) ++DHCP.UseNTP, config_parse_bool, 0, offsetof(Network, dhcp_ntp) + DHCP.UseMTU, config_parse_bool, 0, offsetof(Network, dhcp_mtu) + DHCP.UseHostname, config_parse_bool, 0, offsetof(Network, dhcp_hostname) + DHCP.UseDomains, config_parse_bool, 0, offsetof(Network, dhcp_domains) +-- +2.0.5 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-218-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-218-r6.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-218-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-218-r6.ebuild index 77c1cba554..a4cf04c465 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-218-r5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-218-r6.ebuild @@ -186,6 +186,10 @@ fi # https://github.com/coreos/bugs/issues/186 epatch "${FILESDIR}"/218-0003-core-open-up-DefaultDependencies-property-for-transi.patch + # Allow timesyncd in VMs, make DHCP provided NTP servers optional + epatch "${FILESDIR}"/218-0004-timesyncd-enable-timesyncd-in-virtual-machines.patch + epatch "${FILESDIR}"/218-0005-network-add-UseNTP-DHCP-option.patch + autotools-utils_src_prepare } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219-r1.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219-r1.ebuild index 1bd4640eb7..c7fa9d38e4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219-r1.ebuild @@ -183,6 +183,10 @@ fi # Bug 463376 sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die + # Allow timesyncd in VMs, make DHCP provided NTP servers optional + epatch "${FILESDIR}"/219-0001-timesyncd-enable-timesyncd-in-virtual-machines.patch + epatch "${FILESDIR}"/219-0002-network-add-UseNTP-DHCP-option.patch + autotools-utils_src_prepare }