1.1 --- a/test_files/mk_e2test.sh Tue Apr 26 16:34:54 2022 +0200
1.2 +++ b/test_files/mk_e2test.sh Tue Apr 26 16:36:17 2022 +0200
1.3 @@ -31,14 +31,16 @@
1.4 fi
1.5
1.6 PKGDIR=$(realpath "$1")
1.7 -E2ACCESS_DIR=$(realpath "$2")
1.8 -TARGET=$(realpath "$3")
1.9 +PROGRAMS_DIR=$(realpath "$2")
1.10 +E2ACCESS_DIR=$(realpath "$3")
1.11 +TARGET=$(realpath "$4")
1.12
1.13 -if [ ! -e "$PKGDIR" ] || [ ! -e "$E2ACCESS_DIR" ] || [ ! "$TARGET" ] ; then
1.14 +if [ ! -e "$PKGDIR" ] || [ ! -e "$PROGRAMS_DIR" ] || [ ! -e "$E2ACCESS_DIR" ] || [ ! "$TARGET" ] ; then
1.15 cat 1>&2 <<EOF
1.16 -Usage: $PROGNAME [ -q ] <package directory> <e2access directory> <target>
1.17 +Usage: $PROGNAME [ -q ] <package directory> <programs directory> <e2access directory> <target>
1.18
1.19 Package directory: $PKGDIR
1.20 +Programs directory: $PROGRAMS_DIR
1.21 e2access directory: $E2ACCESS_DIR
1.22 Target filesystem: $TARGET
1.23 EOF
1.24 @@ -102,10 +104,14 @@
1.25
1.26 cd ..
1.27
1.28 -# Put a file in the directory above.
1.29 +# Put file in the created home directory.
1.30
1.31 cp "$PKGDIR/../docs/LICENCE.txt" .
1.32
1.33 +# Put some programs in the same place.
1.34 +
1.35 +cp "$PROGRAMS_DIR/dstest_"* .
1.36 +
1.37 # Leave the filesystem root.
1.38
1.39 cd ../..
1.40 @@ -124,7 +130,7 @@
1.41
1.42 # Add the directories and files to the image.
1.43
1.44 -for DIR in home/paulb/private home/paulb/public home/paulb/shared home/paulb/many home/paulb ; do
1.45 +for DIR in home/paulb home/paulb/private home/paulb/public home/paulb/shared home/paulb/many ; do
1.46 e2access mkdir "$DIR"
1.47 e2access copy-in $(find "$DIR" -maxdepth 1 -type f | sort) "$DIR"
1.48 done