Skip to content

GitLab

Commit 051d2ced authored by Ariadne Conill's avatar Ariadne Conill
Browse files
Options

rootbld: if networking is enabled, copy resolv.conf into the build root

parent f1dfa554
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
abuild.in
View file @ 051d2ced
...@@ -2139,6 +2139,10 @@ rootbld() { ...@@ -2139,6 +2139,10 @@ rootbld() {
cp /etc/abuild.conf /etc/group /etc/passwd "$BUILD_ROOT/etc" cp /etc/abuild.conf /etc/group /etc/passwd "$BUILD_ROOT/etc"
cp /etc/apk/keys/* "$BUILD_ROOT/etc/apk/keys" cp /etc/apk/keys/* "$BUILD_ROOT/etc/apk/keys"
if options_has "net"; then
cp /etc/resolv.conf "$BUILD_ROOT/etc"
fi
local version="edge" buildhost="edge" gitref local version="edge" buildhost="edge" gitref
if gitref="$(expr "$(git symbolic-ref --short HEAD)" : '\([0-9]\+\(\.[0-9]\+\)*\)-')"; then if gitref="$(expr "$(git symbolic-ref --short HEAD)" : '\([0-9]\+\(\.[0-9]\+\)*\)-')"; then
version=v${gitref} version=v${gitref}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment