Skip to content

Add RUNVM_NONET which skips dhclient in helper VM #1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 20, 2020
Merged

Add RUNVM_NONET which skips dhclient in helper VM #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cmd-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ lockfile_out=${tmprepo}/tmp/manifest-lock.generated.${basearch}.json
prepare_compose_overlays
# --cache-only is here since `fetch` is a separate verb.
# shellcheck disable=SC2086
runcompose --cache-only ${FORCE} --add-metadata-from-json "${commitmeta_input_json}" \
RUNVM_NONET=1 runcompose --cache-only ${FORCE} --add-metadata-from-json "${commitmeta_input_json}" \
--write-composejson-to "${composejson}" \
--ex-write-lockfile-to "${lockfile_out}".tmp \
${lock_arg} ${version_arg} ${parent_arg}
Expand Down
2 changes: 1 addition & 1 deletion src/cmdlib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ workdir=${workdir}
# use the builder user's id, otherwise some operations like
# chmod will set ownership to root, not builder
export USER=$(id -u)

export RUNVM_NONET=${RUNVM_NONET:-}
$(cat "${DIR}"/supermin-init-prelude.sh)
rc=0
sh ${TMPDIR}/cmd.sh || rc=\$?
Expand Down
4 changes: 3 additions & 1 deletion src/supermin-init-prelude.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ LANG=C /sbin/load_policy -i
/sbin/modprobe fuse

# set up networking
/usr/sbin/dhclient eth0
if [ -z "${RUNVM_NONET:-}" ]; then
/usr/sbin/dhclient eth0
fi

# set the umask so that anyone in the group can rwx
umask 002
Expand Down