From 776bc061178dca7c1cfaba6779e0c6fd7a63cfbd Mon Sep 17 00:00:00 2001
From: Mikhail Gordeev <obirvalger@altlinux.org>
Date: Thu, 27 Jan 2022 18:14:27 +0300
Subject: [PATCH] Remove resolved script, upstremed to m-p

---
 configs/cb-aarch64.yaml  | 11 +----------
 configs/cb-ve-other.yaml |  8 --------
 configs/cb-ve-x86.yaml   |  8 --------
 configs/cb-vm.yaml       | 10 +---------
 4 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/configs/cb-aarch64.yaml b/configs/cb-aarch64.yaml
index 178d00a..2c42513 100644
--- a/configs/cb-aarch64.yaml
+++ b/configs/cb-aarch64.yaml
@@ -22,7 +22,6 @@ images:
     - method: lxd
     scripts:
     - securetty
-    - resolved
     packages:
     - apt-scripts
     - systemd-settings-disable-kill-user-processes
@@ -46,8 +45,7 @@ images:
     target: vm/cloud-systemd
     kinds:
     - qcow2c
-    scripts:
-    - resolved
+    # scripts:
     packages:
     - update-kernel
     - apt-scripts
@@ -79,13 +77,6 @@ scripts:
       echo pts/1 >> /etc/securetty
     global: no
     number: 1
-  resolved:
-    contents: |
-      #!/bin/sh
-
-      ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
-    global: no
-    number: 99
   apt_sources:
     contents: |
       #!/bin/sh
diff --git a/configs/cb-ve-other.yaml b/configs/cb-ve-other.yaml
index b4a41ce..b3f98ca 100644
--- a/configs/cb-ve-other.yaml
+++ b/configs/cb-ve-other.yaml
@@ -22,7 +22,6 @@ images:
     - method: lxd
     scripts:
     - securetty
-    - resolved
     packages:
     - apt-scripts
     - systemd-settings-disable-kill-user-processes
@@ -71,13 +70,6 @@ scripts:
       echo pts/1 >> /etc/securetty
     global: no
     number: 1
-  resolved:
-    contents: |
-      #!/bin/sh
-
-      ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
-    global: no
-    number: 99
   apt_sources:
     contents: |
       #!/bin/sh
diff --git a/configs/cb-ve-x86.yaml b/configs/cb-ve-x86.yaml
index d56885f..7104917 100644
--- a/configs/cb-ve-x86.yaml
+++ b/configs/cb-ve-x86.yaml
@@ -22,7 +22,6 @@ images:
     - method: lxd
     scripts:
     - securetty
-    - resolved
     packages:
     - apt-scripts
     - systemd-settings-disable-kill-user-processes
@@ -71,13 +70,6 @@ scripts:
       echo pts/1 >> /etc/securetty
     global: no
     number: 1
-  resolved:
-    contents: |
-      #!/bin/sh
-
-      ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
-    global: no
-    number: 99
   apt_sources:
     contents: |
       #!/bin/sh
diff --git a/configs/cb-vm.yaml b/configs/cb-vm.yaml
index cb7c14a..fbc39d2 100644
--- a/configs/cb-vm.yaml
+++ b/configs/cb-vm.yaml
@@ -32,8 +32,7 @@ images:
     exclude_branches:
     - p8
     - c8
-    scripts:
-    - resolved
+    # scripts:
     packages:
     - update-kernel
     - apt-scripts
@@ -79,13 +78,6 @@ scripts:
       echo pts/1 >> /etc/securetty
     global: no
     number: 1
-  resolved:
-    contents: |
-      #!/bin/sh
-
-      ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
-    global: no
-    number: 99
   apt_sources:
     contents: |
       #!/bin/sh