From ef7ce55590fddd0d45d55512a1e81a3e886d86bc Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Thu, 7 Mar 2019 23:36:54 +0100
Subject: [PATCH] ostree: Don't try to drop resolv.conf from an not-existent
/etc
When deploying an OSTree commit /etc is not created. Trying to delete
files from a directory that does not exist is not the most advisable
action, so stop doing so.
Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
---
apertis-ostree-commit.yaml | 6 ++++++
apertis-ostree-image-uboot.yaml | 6 ------
apertis-ostree-image-uefi.yaml | 6 ------
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/apertis-ostree-commit.yaml b/apertis-ostree-commit.yaml
index 31b82641..f03d6d82 100644
--- a/apertis-ostree-commit.yaml
+++ b/apertis-ostree-commit.yaml
@@ -80,6 +80,12 @@ actions:
description: "Empty /etc/machine-id so it's regenerated on first boot with an unique value"
command: truncate -s0 "${ROOTDIR}/etc/machine-id"
+ # work around the Debos isssue in https://phabricator.apertis.org/T4308
+ - action: run
+ chroot: false
+ description: "Drop resolv.conf so the appropriate one gets created at runtime"
+ command: rm "${ROOTDIR}/etc/resolv.conf"
+
- action: run
chroot: false
script: scripts/ostree-convert-from-debian
diff --git a/apertis-ostree-image-uboot.yaml b/apertis-ostree-image-uboot.yaml
index cb0a7da7..1d6f7280 100644
--- a/apertis-ostree-image-uboot.yaml
+++ b/apertis-ostree-image-uboot.yaml
@@ -75,12 +75,6 @@ actions:
origin: mediademo
{{ end }}
- # work around the Debos isssue in https://phabricator.apertis.org/T4308
- - action: run
- chroot: false
- description: "Drop resolv.conf so the appropriate one gets created at runtime"
- command: rm "${ROOTDIR}/etc/resolv.conf"
-
- action: run
description: List files on {{ $image }}
chroot: false
diff --git a/apertis-ostree-image-uefi.yaml b/apertis-ostree-image-uefi.yaml
index 2ae4ffd4..c1abb485 100644
--- a/apertis-ostree-image-uefi.yaml
+++ b/apertis-ostree-image-uefi.yaml
@@ -80,12 +80,6 @@ actions:
chroot: false
script: scripts/setup-uefi-bootloader.sh {{ $osname }}
- # work around the Debos isssue in https://phabricator.apertis.org/T4308
- - action: run
- chroot: false
- description: "Drop resolv.conf so the appropriate one gets created at runtime"
- command: rm "${ROOTDIR}/etc/resolv.conf"
-
- action: run
description: List files on {{ $image }}
chroot: false
--
GitLab