Browse Source

Don't install apk-tools into rootfs unless --script-chroot

Jakub Jirutka 5 years ago
parent
commit
e1d3d8457a
1 changed files with 2 additions and 2 deletions
  1. 2 2
      alpine-make-rootfs

+ 2 - 2
alpine-make-rootfs

@@ -389,8 +389,6 @@ fi
 if [ "$SCRIPT" ]; then
 if [ "$SCRIPT" ]; then
 	script_name="${SCRIPT##*/}"
 	script_name="${SCRIPT##*/}"
 
 
-	_apk add --root "$rootfs" -t "$VIRTUAL_PKG" apk-tools >&2
-
 	if [ "$SCRIPT_CHROOT" = 'no' ]; then
 	if [ "$SCRIPT_CHROOT" = 'no' ]; then
 		einfo "Executing script: $script_name $*"
 		einfo "Executing script: $script_name $*"
 
 
@@ -398,6 +396,8 @@ if [ "$SCRIPT" ]; then
 	else
 	else
 		einfo "Executing script in chroot: $script_name $*"
 		einfo "Executing script in chroot: $script_name $*"
 
 
+		_apk add --root "$rootfs" -t "$VIRTUAL_PKG" apk-tools >&2
+
 		prepare_chroot "$rootfs"
 		prepare_chroot "$rootfs"
 		mount_bind "${SCRIPT%/*}" "$rootfs"/mnt
 		mount_bind "${SCRIPT%/*}" "$rootfs"/mnt
 		chroot "$rootfs" \
 		chroot "$rootfs" \