Skip to content

Commit

Permalink
overlay/usr/lib/tmpfiles.d/etc.conf: remove /etc/resolv.conf symlink
Browse files Browse the repository at this point in the history
  • Loading branch information
vrutkovs committed Nov 21, 2020
1 parent 197a350 commit e32851b
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
8 changes: 8 additions & 0 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ commit_id="$( <${dir}/meta.json jq -r '."ostree-commit"' )"
mkdir /srv/repo
curl -L "${tar_url}" | tar xf - -C /srv/repo/ --no-same-owner

# Remove all refs except ${REF} so that bootstrap pivot would not be confused
set -x
ostree --repo=/srv/repo refs | grep -v "${REF}" | xargs -n1 ostree --repo=/srv/repo refs --delete
ostree --repo=/srv/repo refs
exit 1

# use repos from FCOS
rm -rf /etc/yum.repos.d
ostree --repo=/srv/repo checkout "${REF}" --subpath /usr/etc/yum.repos.d --user-mode /etc/yum.repos.d
Expand Down Expand Up @@ -119,3 +125,5 @@ cp -rvf /srv/addons/* /tmp/working/

# build new commit
coreos-assembler dev-overlay --repo /srv/repo --rev "${REF}" --add-tree /tmp/working --output-ref "${REF}"
ostree --repo=/srv/repo refs
exit 1
12 changes: 12 additions & 0 deletions overlay/usr/lib/tmpfiles.d/etc.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# 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/os-release - - - - ../usr/lib/os-release
L+ /etc/mtab - - - - ../proc/self/mounts
C! /etc/nsswitch.conf - - - -
C! /etc/pam.d - - - -
C! /etc/issue - - - -

0 comments on commit e32851b

Please sign in to comment.