only copy disk to /mnt in docker

Author: tesuji

scripts/create-image/Dockerfile

@@ -23,6 +23,7 @@ ENV ADD_PACKAGE="make,sysbench,git,vim,tmux,usbutils,tcpdump,net-tools"
 ENV FEATURE=minimal
 ENV SEEK=2047
 ENV PERF=false
+ENV IN_DOCKER=true
 
 # Use COPY after agt-get to allow caching apt
 WORKDIR /src
@@ -31,5 +32,5 @@ RUN ./debootstrap.sh
 
 # will copy the img file to /mnt. Need --privilege flag for docker run.
 COPY --chmod=0755 configure.sh /src/
-CMD ["./configure.sh"]
+CMD ["bash", "-x", "./configure.sh"]
 

scripts/create-image/configure.sh

@@ -2,9 +2,6 @@
 # Copyright 2025 syzkaller project authors. All rights reserved.
 # Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
-sudo mkdir -p /fs/$DIR /mnt
-pushd /mnt
-
 # Set some defaults and enable promtless ssh to the machine for root.
 sudo sed -i '/^root/ { s/:x:/::/ }' $DIR/etc/passwd
 echo 'T0:23:respawn:/sbin/getty -L ttyS0 115200 vt100' | sudo tee -a $DIR/etc/inittab
@@ -57,8 +54,11 @@ sudo chown -R 1000:1000 $DIR/home/user
 # Build a disk image
 dd if=/dev/zero of=$RELEASE.img bs=1M seek=$SEEK count=1
 sudo mkfs.ext4 -F $RELEASE.img
+sudo mkdir -p /fs/$DIR /mnt
 sudo mount -o loop $RELEASE.img /fs/$DIR
 sudo cp -a $DIR/. /fs/$DIR/.
 sudo umount /fs/$DIR
 
-popd
+if [ "$IN_DOCKER" = true ]; then
+    cp $RELEASE.* /mnt
+fi

scripts/create-image/create-image.sh

@@ -20,6 +20,7 @@ RELEASE=trixie
 FEATURE=minimal
 SEEK=2047
 PERF=false
+IN_DOCKER=false
 
 # Display help function
 display_help() {
@@ -77,7 +78,7 @@ if [ $PERF = "true" ] && [ -z ${KERNEL+x} ]; then
 fi
 
 # If full feature is chosen, install more packages
-if [ $FEATURE = "full" ]; then
+if [ "$FEATURE" = "full" ]; then
     PREINSTALL_PKGS=$PREINSTALL_PKGS","$ADD_PACKAGE
 fi