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