|
 |
152484 |
From 92b6ae2097ae90355775217529d2fd55f7b84e31 Mon Sep 17 00:00:00 2001
|
|
|
152484 |
From: Michal Sekletar <msekleta@redhat.com>
|
|
|
152484 |
Date: Thu, 5 Aug 2021 17:11:47 +0200
|
|
|
152484 |
Subject: [PATCH] tmpfiles: don't create resolv.conf -> stub-resolv.conf
|
|
|
152484 |
symlink
|
|
|
152484 |
|
|
|
152484 |
RHEL-only
|
|
|
152484 |
|
|
|
152484 |
Resolves: #1989472
|
|
|
152484 |
---
|
|
|
152484 |
tmpfiles.d/meson.build | 1 -
|
|
|
152484 |
tmpfiles.d/systemd-resolve.conf | 10 ----------
|
|
|
152484 |
2 files changed, 11 deletions(-)
|
|
|
152484 |
delete mode 100644 tmpfiles.d/systemd-resolve.conf
|
|
|
152484 |
|
|
|
152484 |
diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
|
|
|
152484 |
index b8d3919025..6ae9e3e0b8 100644
|
|
|
152484 |
--- a/tmpfiles.d/meson.build
|
|
|
152484 |
+++ b/tmpfiles.d/meson.build
|
|
|
152484 |
@@ -7,7 +7,6 @@ files = [['README', ''],
|
|
|
152484 |
['journal-nocow.conf', ''],
|
|
|
152484 |
['systemd-nologin.conf', 'HAVE_PAM'],
|
|
|
152484 |
['systemd-nspawn.conf', 'ENABLE_MACHINED'],
|
|
|
152484 |
- ['systemd-resolve.conf', 'ENABLE_RESOLVE'],
|
|
|
152484 |
['systemd-tmp.conf', ''],
|
|
|
152484 |
['portables.conf', 'ENABLE_PORTABLED'],
|
|
|
152484 |
['systemd-pstore.conf', 'ENABLE_PSTORE'],
|
|
|
152484 |
diff --git a/tmpfiles.d/systemd-resolve.conf b/tmpfiles.d/systemd-resolve.conf
|
|
|
152484 |
deleted file mode 100644
|
|
|
152484 |
index cb1c56d6a6..0000000000
|
|
|
152484 |
--- a/tmpfiles.d/systemd-resolve.conf
|
|
|
152484 |
+++ /dev/null
|
|
|
152484 |
@@ -1,10 +0,0 @@
|
|
|
152484 |
-# This file is part of systemd.
|
|
|
152484 |
-#
|
|
|
152484 |
-# systemd is free software; you can redistribute it and/or modify it
|
|
|
152484 |
-# under the terms of the GNU Lesser General Public License as published by
|
|
|
152484 |
-# the Free Software Foundation; either version 2.1 of the License, or
|
|
|
152484 |
-# (at your option) any later version.
|
|
|
152484 |
-
|
|
|
152484 |
-# See tmpfiles.d(5) for details
|
|
|
152484 |
-
|
|
|
152484 |
-L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf
|