diff options
| author | Kees Cook <keescook@google.com> | 2019-03-06 09:23:27 -0800 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-03-06 18:44:30 +0100 |
| commit | 18215b8d64c9bf653619b9eb9907445e225adf11 (patch) | |
| tree | bc560d258051fbc7c995c4e983c856c44c190871 | |
| parent | 967dc02d70f8e3d027738295977762cd4fbed5c7 (diff) | |
create-image.sh: Fix "full" package list
The list of packages to install is comma-separated, not space. This
fixes the "-f full" argument to actually install the expected packages.
| -rwxr-xr-x | tools/create-image.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/create-image.sh b/tools/create-image.sh index 0ecfdaab0..77679615d 100755 --- a/tools/create-image.sh +++ b/tools/create-image.sh @@ -7,7 +7,6 @@ set -eux # Create a minimal Debian distribution in a directory. -ADDITIONAL_PACKAGE="make sysbench git vim tmux usbutils" DIR=chroot # Variables affected by options @@ -59,12 +58,12 @@ while true; do done if [ $FEATURE = "full" ]; then - ADD_PACKAGE=$ADDITIONAL_PACKAGE + ADD_PACKAGE=",make,sysbench,git,vim,tmux,usbutils" fi sudo rm -rf $DIR mkdir -p $DIR -sudo debootstrap --include=openssh-server,curl,tar,gcc,libc6-dev,time,strace,sudo,less,psmisc,selinux-utils,policycoreutils,checkpolicy,selinux-policy-default $ADD_PACKAGE $RELEASE $DIR +sudo debootstrap --include=openssh-server,curl,tar,gcc,libc6-dev,time,strace,sudo,less,psmisc,selinux-utils,policycoreutils,checkpolicy,selinux-policy-default"$ADD_PACKAGE" $RELEASE $DIR # Set some defaults and enable promtless ssh to the machine for root. sudo sed -i '/^root/ { s/:x:/::/ }' $DIR/etc/passwd |