|
@@ -387,11 +387,16 @@ fi
|
|
|
|
|
|
_apk add --root "$rootfs" --update-cache --initdb $rootfs_pkgs >&2
|
|
|
|
|
|
-if ! _apk info --root "$rootfs" --quiet --installed alpine-base; then
|
|
|
- # This package contains /etc/os-release, /etc/alpine-release and /etc/issue,
|
|
|
- # but we don't wanna install all its dependencies (e.g. openrc).
|
|
|
- _apk fetch --root "$rootfs" --stdout alpine-base \
|
|
|
- | tar -xz -C "$rootfs" etc >&2
|
|
|
+if ! [ -f "$rootfs"/etc/alpine-release ]; then
|
|
|
+ if _apk info --root "$rootfs" --quiet alpine-release >/dev/null; then
|
|
|
+ _apk add --root "$rootfs" alpine-release
|
|
|
+ else
|
|
|
+ # In Alpine <3.17, this package contains /etc/os-release,
|
|
|
+ # /etc/alpine-release and /etc/issue, but we don't wanna install all
|
|
|
+ # its dependencies (e.g. openrc).
|
|
|
+ _apk fetch --root "$rootfs" --stdout alpine-base \
|
|
|
+ | tar -xz -C "$rootfs" etc >&2
|
|
|
+ fi
|
|
|
fi
|
|
|
|
|
|
[ -e "$rootfs"/var/run ] || ln -s /run "$rootfs"/var/run
|