Update emptyfs support to work properly if scratch is already an image

Also, this decouples the emptyfs script from the busybox one -- they're now functionally separate thanks to the scratch no-op change. 👍

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
This commit is contained in:
Tianon Gravi
2015-01-20 16:26:04 -07:00
parent 9305020d9f
commit 51b5dc185b
3 changed files with 8 additions and 6 deletions
+1
View File
@@ -20,6 +20,7 @@ bundle_test_integration_cli() {
sleep 2
source "$(dirname "$BASH_SOURCE")/.ensure-busybox"
source "$(dirname "$BASH_SOURCE")/.ensure-emptyfs"
bundle_test_integration_cli
}; then