From 17ecfc74ffe61b18774ff0990e865054aae519f3 Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Tue, 12 Mar 2019 18:11:09 +0100
Subject: [PATCH] ospack: Disable fqdn resolution for sudo
When opening a new session sudo tries to resolve the fqdn of the host, but that
introduces a sensible delay if the host does not have a fqdn set up
appropriately, as it is often the case with development board or when booting
images in QEMU.
We currently also ship libnss-myhostname which in theory could solve the issue
at the system level and not just for sudo, but upstream configures it to come
*after* dns resolution to avoid breaking `hostname --fqdn`, see
https://github.com/systemd/systemd/issues/1280
Our use-case is sligthly different and we may configure libnss-myhostname to
precede dns resolution, but in the meantime keep disabling this in sudo as the
apertis-customization package used to do.
Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
---
apertis-ospack-basesdk.yaml | 3 +++
apertis-ospack-devroot.yaml | 3 +++
apertis-ospack-minimal.yaml | 3 +++
apertis-ospack-sdk.yaml | 3 +++
apertis-ospack-target.yaml | 3 +++
overlays/sudo-fqdn/etc/sudoers.d/disable-fqdn | 3 +++
6 files changed, 18 insertions(+)
create mode 100644 overlays/sudo-fqdn/etc/sudoers.d/disable-fqdn
diff --git a/apertis-ospack-basesdk.yaml b/apertis-ospack-basesdk.yaml
index 98a011cc..354f0c70 100644
--- a/apertis-ospack-basesdk.yaml
+++ b/apertis-ospack-basesdk.yaml
@@ -475,6 +475,9 @@ actions:
- action: overlay
source: overlays/create-homedir
+ - action: overlay
+ source: overlays/sudo-fqdn
+
- action: overlay
source: overlays/default-locale-c-utf8
diff --git a/apertis-ospack-devroot.yaml b/apertis-ospack-devroot.yaml
index d3fabab8..cf2a37ae 100644
--- a/apertis-ospack-devroot.yaml
+++ b/apertis-ospack-devroot.yaml
@@ -377,6 +377,9 @@ actions:
- action: overlay
source: overlays/create-homedir
+ - action: overlay
+ source: overlays/sudo-fqdn
+
- action: overlay
source: overlays/default-locale-c-utf8
diff --git a/apertis-ospack-minimal.yaml b/apertis-ospack-minimal.yaml
index a2b91915..a5c458da 100644
--- a/apertis-ospack-minimal.yaml
+++ b/apertis-ospack-minimal.yaml
@@ -97,6 +97,9 @@ actions:
- action: overlay
source: overlays/create-homedir
+ - action: overlay
+ source: overlays/sudo-fqdn
+
- action: overlay
source: overlays/default-locale-c-utf8
diff --git a/apertis-ospack-sdk.yaml b/apertis-ospack-sdk.yaml
index fa5a3965..4d146fd4 100644
--- a/apertis-ospack-sdk.yaml
+++ b/apertis-ospack-sdk.yaml
@@ -673,6 +673,9 @@ actions:
- action: overlay
source: overlays/create-homedir
+ - action: overlay
+ source: overlays/sudo-fqdn
+
- action: overlay
source: overlays/default-locale-c-utf8
diff --git a/apertis-ospack-target.yaml b/apertis-ospack-target.yaml
index 1ac135cf..b7513960 100644
--- a/apertis-ospack-target.yaml
+++ b/apertis-ospack-target.yaml
@@ -210,6 +210,9 @@ actions:
- action: overlay
source: overlays/create-homedir
+ - action: overlay
+ source: overlays/sudo-fqdn
+
- action: overlay
source: overlays/default-locale-c-utf8
diff --git a/overlays/sudo-fqdn/etc/sudoers.d/disable-fqdn b/overlays/sudo-fqdn/etc/sudoers.d/disable-fqdn
new file mode 100644
index 00000000..4937aff8
--- /dev/null
+++ b/overlays/sudo-fqdn/etc/sudoers.d/disable-fqdn
@@ -0,0 +1,3 @@
+# FQDN lookup is painfully slow if the DNS server is misconfigured.
+# Use gethostname() instead.
+Defaults !fqdn
--
GitLab