summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/testlab.bbclass2
-rw-r--r--recipes/images/minimal-image.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/testlab.bbclass b/classes/testlab.bbclass
index bb47ee877f..fc923c5112 100644
--- a/classes/testlab.bbclass
+++ b/classes/testlab.bbclass
@@ -22,7 +22,7 @@
# Needs 'dot', 'opkg-cl'
do_testlab() {
-if [ -e ${IMAGE_ROOTFS}/etc/opkg ] ; then
+if [ -e ${IMAGE_ROOTFS}/etc/opkg ] && [ "${ONLINE_PACKAGE_MANAGEMENT}" = "full" ] ; then
TESTLAB_DIR="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-testlab"
mkdir -p ${TESTLAB_DIR}/
diff --git a/recipes/images/minimal-image.bb b/recipes/images/minimal-image.bb
index 650a3d681c..e9abcb35ca 100644
--- a/recipes/images/minimal-image.bb
+++ b/recipes/images/minimal-image.bb
@@ -9,7 +9,7 @@ SPLASH ?= " "
IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
IMAGE_INSTALL = "task-boot \
- util-linux-mount util-linux-umount \
+ util-linux-ng-mount util-linux-ng-umount \
${DISTRO_SSH_DAEMON} \
${ANGSTROM_EXTRA_INSTALL} \
angstrom-version \