openstack
/
diskimage-builder
Code Issues Proposed changes

tests/elements/fake-os: add '/tmp' as top level dir 

lib/img-functions:finalise_base() does a recursive unmount of /tmp to
cleanup any old mounts that might be in there (we do things like bind
mount caches in there).  unmount_dir fails if /tmp isn't a
directory.

The 'run_output_format_test.sh' uses the 'fake-os' element for
testing.  Because 'fake-os' did not create the '/tmp' directory, the
test script fails.

This patch fixes the problem: it adds '/tmp' to the list of
directories that are created.

It was implemented replacing the existing five 'mkdir'
command with a for loop over now six directories.

Change-Id: Ic7aca155492967b9819f129d3843cf95e136410e
Signed-off-by: Andreas Florath <andreas@florath.net>
This commit is contained in:
Andreas Florath 2016-05-06 16:34:31 +02:00 committed by Ian Wienand
parent 6c57795056
commit 0aa7f38a7f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/elements/fake-os/root.d/10-fake-os
View File

@ -5,11 +5,9 @@ set -o pipefail
sudo touch $TARGET_ROOT/fake-os
sudo mkdir -p $TARGET_ROOT/etc
sudo mkdir -p $TARGET_ROOT/mnt
sudo mkdir -p $TARGET_ROOT/proc
sudo mkdir -p $TARGET_ROOT/dev
sudo mkdir -p $TARGET_ROOT/sys
for DIR in etc mnt proc dev sys tmp; do
sudo mkdir -p ${TARGET_ROOT}/${DIR}
done
# We need some size so the mkfs does not fail when making an fs of size 0
# We also need to account for the journal size on the FS