Merge remote-tracking branch 'upstream/tripleo' into tripleo

flavours/hwdiscovery/install.d/10-AMQPLib

@@ -1,7 +0,0 @@
-#!/bin/bash
-# ensure we have a amqp client
-
-set -e
-set -o xtrace
-
-apt-get -y install python-AMQPLib

flavours/hwdiscovery/install.d/10-hwinfo

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Support for hard ware discovery
+
+set -e
+set -o xtrace
+
+apt-get -y install hwinfo

lib/common-functions

@@ -105,5 +105,5 @@ function mount_qcow_image() {
 
     WORK_DIR=$(mktemp -d)
     map_nbd $1
-    sudo mount $NBD_DEV $WORK_DIR
+    sudo mount ${NBD_DEV}p1 $WORK_DIR
 }

lib/ramdisk-functions

@@ -63,7 +63,7 @@ function populate_lib () {
   echo "Populating /lib"
 
   libs=
-  for i in "$BUSYBOX" bash modprobe udevd udevadm wget reboot shutdown $BINARY_DEPS ; do
+  for i in "$BUSYBOX" bash lsmod modprobe udevd udevadm wget reboot shutdown $BINARY_DEPS ; do
     if "$BUSYBOX" --list | grep "^$i\$" >/dev/null; then
       continue
     fi