Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3991 from HiassofT/le92-nfs-backports
[le92] NFS / netboot backports
- Loading branch information
Showing
16 changed files
with
277 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| TIMESYNCD.CONF(5) timesyncd.conf TIMESYNCD.CONF(5) | ||
|
|
||
| NAME | ||
| timesyncd.conf, timesyncd.conf.d - Network Time Synchronization | ||
| configuration files | ||
|
|
||
| SYNOPSIS | ||
| /etc/systemd/timesyncd.conf | ||
|
|
||
| /etc/systemd/timesyncd.conf.d/*.conf | ||
|
|
||
| /run/systemd/timesyncd.conf.d/*.conf | ||
|
|
||
| /usr/lib/systemd/timesyncd.conf.d/*.conf | ||
|
|
||
| DESCRIPTION | ||
| These configuration files control NTP network time synchronization. See | ||
| systemd.syntax(5) for a general description of the syntax. | ||
|
|
||
| CONFIGURATION DIRECTORIES AND PRECEDENCE | ||
| The default configuration is defined during compilation, so a | ||
| configuration file is only needed when it is necessary to deviate from | ||
| those defaults. By default, the configuration file in /etc/systemd/ | ||
| contains commented out entries showing the defaults as a guide to the | ||
| administrator. This file can be edited to create local overrides. | ||
|
|
||
| When packages need to customize the configuration, they can install | ||
| configuration snippets in /usr/lib/systemd/*.conf.d/. Files in /etc/ | ||
| are reserved for the local administrator, who may use this logic to | ||
| override the configuration files installed by vendor packages. The main | ||
| configuration file is read before any of the configuration directories, | ||
| and has the lowest precedence; entries in a file in any configuration | ||
| directory override entries in the single configuration file. Files in | ||
| the *.conf.d/ configuration subdirectories are sorted by their filename | ||
| in lexicographic order, regardless of which of the subdirectories they | ||
| reside in. When multiple files specify the same option, for options | ||
| which accept just a single value, the entry in the file with the | ||
| lexicographically latest name takes precedence. For options which | ||
| accept a list of values, entries are collected as they occur in files | ||
| sorted lexicographically. It is recommended to prefix all filenames in | ||
| those subdirectories with a two-digit number and a dash, to simplify | ||
| the ordering of the files. | ||
|
|
||
| To disable a configuration file supplied by the vendor, the recommended | ||
| way is to place a symlink to /dev/null in the configuration directory | ||
| in /etc/, with the same filename as the vendor configuration file. | ||
|
|
||
| OPTIONS | ||
| The following settings are configured in the "[Time]" section: | ||
|
|
||
| NTP= | ||
| A space-separated list of NTP server host names or IP addresses. | ||
| During runtime this list is combined with any per-interface NTP | ||
| servers acquired from systemd-networkd.service(8). | ||
| systemd-timesyncd will contact all configured system or | ||
| per-interface servers in turn until one is found that responds. | ||
| When the empty string is assigned, the list of NTP servers is | ||
| reset, and all assignments prior to this one will have no effect. | ||
| This setting defaults to an empty list. | ||
|
|
||
| FallbackNTP= | ||
| A space-separated list of NTP server host names or IP addresses to | ||
| be used as the fallback NTP servers. Any per-interface NTP servers | ||
| obtained from systemd-networkd.service(8) take precedence over this | ||
| setting, as do any servers set via NTP= above. This setting is | ||
| hence only used if no other NTP server information is known. When | ||
| the empty string is assigned, the list of NTP servers is reset, and | ||
| all assignments prior to this one will have no effect. If this | ||
| option is not given, a compiled-in list of NTP servers is used | ||
| instead. | ||
|
|
||
| RootDistanceMaxSec= | ||
| Maximum acceptable root distance. Takes a time value (in seconds). | ||
| Defaults to 5 seconds. | ||
|
|
||
| PollIntervalMinSec=, PollIntervalMaxSec= | ||
| The minimum and maximum poll intervals for NTP messages. Each | ||
| setting takes a time value (in seconds). PollIntervalMinSec= must | ||
| not be smaller than 16 seconds. PollIntervalMaxSec= must be larger | ||
| than PollIntervalMinSec=. PollIntervalMinSec= defaults to 32 | ||
| seconds, and PollIntervalMaxSec= defaults to 2048 seconds. | ||
|
|
||
| SEE ALSO | ||
| systemd(1), systemd-timesyncd.service(8), systemd-networkd.service(8) | ||
|
|
||
| systemd 241 TIMESYNCD.CONF(5) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
.../systemd/patches/systemd-0900-backport-do-not-update-exec-deps-on-mountinfo-changes.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| From 9074b57fd5a5c8ae20b15b59ed9abe9a7f0147b0 Mon Sep 17 00:00:00 2001 | ||
| From: Lennart Poettering <lennart@poettering.net> | ||
| Date: Fri, 15 Nov 2019 14:00:54 +0100 | ||
| Subject: [PATCH] mount: do not update exec deps on mountinfo changes | ||
|
|
||
| Fixes: #13978 | ||
| --- | ||
| src/core/mount.c | 42 ++++++++++++++++++++++++++++-------------- | ||
| 1 file changed, 28 insertions(+), 14 deletions(-) | ||
|
|
||
| diff --git a/src/core/mount.c b/src/core/mount.c | ||
| index 1d1d2683da4..dfed691c43f 100644 | ||
| --- a/src/core/mount.c | ||
| +++ b/src/core/mount.c | ||
| @@ -550,6 +550,32 @@ static int mount_verify(Mount *m) { | ||
| return 0; | ||
| } | ||
|
|
||
| +static int mount_add_non_exec_dependencies(Mount *m) { | ||
| + int r; | ||
| + assert(m); | ||
| + | ||
| + /* Adds in all dependencies directly responsible for ordering the mount, as opposed to dependencies | ||
| + * resulting from the ExecContext and such. */ | ||
| + | ||
| + r = mount_add_device_dependencies(m); | ||
| + if (r < 0) | ||
| + return r; | ||
| + | ||
| + r = mount_add_mount_dependencies(m); | ||
| + if (r < 0) | ||
| + return r; | ||
| + | ||
| + r = mount_add_quota_dependencies(m); | ||
| + if (r < 0) | ||
| + return r; | ||
| + | ||
| + r = mount_add_default_dependencies(m); | ||
| + if (r < 0) | ||
| + return r; | ||
| + | ||
| + return 0; | ||
| +} | ||
| + | ||
| static int mount_add_extras(Mount *m) { | ||
| Unit *u = UNIT(m); | ||
| int r; | ||
| @@ -577,18 +603,6 @@ static int mount_add_extras(Mount *m) { | ||
| return r; | ||
| } | ||
|
|
||
| - r = mount_add_device_dependencies(m); | ||
| - if (r < 0) | ||
| - return r; | ||
| - | ||
| - r = mount_add_mount_dependencies(m); | ||
| - if (r < 0) | ||
| - return r; | ||
| - | ||
| - r = mount_add_quota_dependencies(m); | ||
| - if (r < 0) | ||
| - return r; | ||
| - | ||
| r = unit_patch_contexts(u); | ||
| if (r < 0) | ||
| return r; | ||
| @@ -601,7 +615,7 @@ static int mount_add_extras(Mount *m) { | ||
| if (r < 0) | ||
| return r; | ||
|
|
||
| - r = mount_add_default_dependencies(m); | ||
| + r = mount_add_non_exec_dependencies(m); | ||
| if (r < 0) | ||
| return r; | ||
|
|
||
| @@ -1574,7 +1588,7 @@ static int mount_setup_existing_unit( | ||
|
|
||
| unit_remove_dependencies(u, UNIT_DEPENDENCY_MOUNTINFO_IMPLICIT); | ||
|
|
||
| - r = mount_add_extras(MOUNT(u)); | ||
| + r = mount_add_non_exec_dependencies(MOUNT(u)); | ||
| if (r < 0) | ||
| return r; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| #!/bin/sh | ||
|
|
||
| # setup hostname | ||
| if [ -f /storage/.cache/hostname ]; then | ||
| cat /storage/.cache/hostname > /proc/sys/kernel/hostname | ||
| fi | ||
|
|
||
| # setup /etc/hosts | ||
| rm -f /run/libreelec/hosts | ||
| if [ -f /storage/.config/hosts.conf ]; then | ||
| cat /storage/.config/hosts.conf > /run/libreelec/hosts | ||
| fi | ||
|
|
||
| # setup /etc/resolv.conf | ||
| rm -f /run/libreelec/resolv.conf | ||
| if [ -f /storage/.config/resolv.conf ]; then | ||
| cat /storage/.config/resolv.conf > /run/libreelec/resolv.conf | ||
| elif [ -f /dev/.kernel_ipconfig -a -f /proc/net/pnp ]; then | ||
| cat /proc/net/pnp > /run/libreelec/resolv.conf | ||
| else | ||
| cat << EOF > /run/libreelec/resolv.conf | ||
| nameserver 8.8.8.8 | ||
| nameserver 8.8.4.4 | ||
| EOF | ||
| fi | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| #!/bin/sh | ||
| KERNEL_NTP="${1:-/proc/net/ipconfig/ntp_servers}" | ||
| NTP_SERVERS="" | ||
| if [ -f /proc/net/ipconfig/ntp_servers ]; then | ||
| for srv in $(cat /proc/net/ipconfig/ntp_servers); do | ||
| if [ -n "$srv" -a "$srv" != "0.0.0.0" ]; then | ||
| if [ -z "$NTP_SERVERS" ]; then | ||
| NTP_SERVERS="$srv" | ||
| else | ||
| NTP_SERVERS="${NTP_SERVERS} $srv" | ||
| fi | ||
| fi | ||
| done | ||
| if [ -n "$NTP_SERVERS" ]; then | ||
| mkdir -p /run/systemd/timesyncd.conf.d/ | ||
| cat << EOF > /run/systemd/timesyncd.conf.d/kernel-ntp-servers.conf | ||
| [Time] | ||
| NTP=$NTP_SERVERS | ||
| EOF | ||
| fi | ||
| fi | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| [Unit] | ||
| Description=Base Network Configuration | ||
| DefaultDependencies=no | ||
| After=local-fs.target systemd-tmpfiles-setup.service userconfig.service | ||
|
|
||
| [Service] | ||
| Type=oneshot | ||
| ExecStart=/usr/sbin/network-base-setup | ||
| RemainAfterExit=yes | ||
|
|
||
| [Install] | ||
| WantedBy=network.target |
2 changes: 2 additions & 0 deletions
2
packages/sysutils/systemd/system.d/storage.mount.d/dependencies.conf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| [Unit] | ||
| DefaultDependencies=no |
12 changes: 12 additions & 0 deletions
12
packages/sysutils/systemd/system.d/systemd-timesyncd-setup.service
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| [Unit] | ||
| Description=Setup NTP servers for timesyncd | ||
| DefaultDependencies=no | ||
| After=systemd-remount-fs.service systemd-sysusers.service | ||
|
|
||
| [Service] | ||
| Type=oneshot | ||
| ExecStart=/usr/sbin/systemd-timesyncd-setup | ||
| RemainAfterExit=yes | ||
|
|
||
| [Install] | ||
| WantedBy=sysinit.target |
3 changes: 3 additions & 0 deletions
3
...ges/sysutils/systemd/system.d/systemd-timesyncd.service.d/depend-on-kernel-ip-config.conf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| [Unit] | ||
| ConditionPathExists=/dev/.kernel_ipconfig | ||
| After=systemd-timesyncd-setup.service network-base.service |