Skip to content
Snippets Groups Projects
Commit ef7ce555 authored by Emanuele Aina's avatar Emanuele Aina
Browse files

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's avatarEmanuele Aina <emanuele.aina@collabora.com>
parent 5383ab91
No related branches found
No related tags found
1 merge request!99Fix builds (bootctl and ostree)
This commit is part of merge request !91. Comments created here will be created in the context of that merge request.
......@@ -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
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment