From 343d6b8494aab34941981cb200e6f50f78cecc89 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Thu, 23 Oct 2014 13:25:22 -0400 Subject: [PATCH] Build discovery ramdisk using dracut Removes the busybox install in the discovery ramdisk element (it should be handled by the ramdisk element anyway) and adds the appropriate dib option to use dracut. --- elements/discovery-ironic/binary-deps.d/discovery-ironic | 1 - .../install.d/52-discovery-ironic-install-busybox | 6 ------ scripts/instack-build-images | 1 + 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100755 elements/discovery-ironic/install.d/52-discovery-ironic-install-busybox diff --git a/elements/discovery-ironic/binary-deps.d/discovery-ironic b/elements/discovery-ironic/binary-deps.d/discovery-ironic index 58c369f96..a5c81c1ad 100644 --- a/elements/discovery-ironic/binary-deps.d/discovery-ironic +++ b/elements/discovery-ironic/binary-deps.d/discovery-ironic @@ -1,4 +1,3 @@ -busybox curl dmidecode fdisk diff --git a/elements/discovery-ironic/install.d/52-discovery-ironic-install-busybox b/elements/discovery-ironic/install.d/52-discovery-ironic-install-busybox deleted file mode 100755 index f50b56c26..000000000 --- a/elements/discovery-ironic/install.d/52-discovery-ironic-install-busybox +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -eu -set -o pipefail - -install-packages busybox diff --git a/scripts/instack-build-images b/scripts/instack-build-images index ba533fb2f..667471063 100755 --- a/scripts/instack-build-images +++ b/scripts/instack-build-images @@ -152,6 +152,7 @@ function discovery-ramdisk { ramdisk-image-create \ -a $NODE_ARCH \ -o $DISCOVERY_NAME \ + --ramdisk-element dracut-ramdisk \ $NODE_DIST $DISCOVERY_IMAGE_ELEMENT \ $DIB_COMMON_ELEMENTS \ 2>&1 | tee dib-discovery.log