From 8cf37064a523f6159dd1a0cba19fe487f43257a9 Mon Sep 17 00:00:00 2001 From: Gregory Haynes Date: Mon, 6 Jul 2015 16:44:07 +0000 Subject: [PATCH] Remove deprecated disk-image-get-kernel This script has been deprecated in favor of the baremetal element for some time. Lets remove it. Change-Id: Idd7db766a039ba8e74f0e98e74eb27246e753f4b --- MANIFEST.in | 1 - README.rst | 4 -- bin/disk-image-get-kernel | 90 ----------------------------- doc/source/developer/components.rst | 6 -- setup.cfg | 1 - 5 files changed, 102 deletions(-) delete mode 100755 bin/disk-image-get-kernel diff --git a/MANIFEST.in b/MANIFEST.in index 780e8c9b..4baad280 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,4 @@ include bin/disk-image-create -include bin/disk-image-get-kernel include bin/element-info include bin/ramdisk-image-create graft lib diff --git a/README.rst b/README.rst index e19a8598..9df6126d 100644 --- a/README.rst +++ b/README.rst @@ -37,10 +37,6 @@ What tools are there? To generate kernel+ramdisk pair for use with ironic, use ramdisk-image-create -o deploy.ramdisk deploy-ironic -* disk-image-get-kernel filename : **DEPRECATED** Extract the appropriate - kernel and ramdisk to use when doing PXE boot using filename as the image - for a machine. Consider using the `baremetal` element, rather than this tool. - * elements can be found in the top level elements directory. * element-info : Extract information about elements. diff --git a/bin/disk-image-get-kernel b/bin/disk-image-get-kernel deleted file mode 100755 index a4796692..00000000 --- a/bin/disk-image-get-kernel +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash -# -# Copyright 2012 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -e - -SCRIPTNAME=$(basename $0) -SCRIPT_HOME=$(dirname $0) -if [ -d $SCRIPT_HOME/../share/diskimage-builder ]; then - export _PREFIX=$SCRIPT_HOME/../share/diskimage-builder -else - export _PREFIX=$SCRIPT_HOME/.. -fi -export _LIB=$_PREFIX/lib -source $_LIB/die - -function show_options () { - echo "Usage: $SCRIPTNAME -i [-d ] [-o &2 ; exit 1 ; fi - -# Note the quotes around `$TEMP': they are essential! -eval set -- "$TEMP" - -export OUT_DIR=/tmp -export OUT_PFX=baremetal - -while true ; do - case "$1" in - -d) export OUT_DIR=$2; shift 2 ;; - -i) export IMAGE_FILE=$2; shift 2 ;; - -o) export OUT_PFX=$2; shift 2 ;; - -h) show_options;; - -x) shift; set -x;; - --) shift ; break ;; - *) echo "Internal error!" ; exit 1 ;; - esac -done - -if [[ ! -n "$IMAGE_FILE" ]]; then - die "You must specify an image to read from with -i \$filename" -elif [[ ! -r "$IMAGE_FILE" ]]; then - die "Image file $IMAGE_FILE is not readable" -fi - -source $_LIB/img-defaults -source $_LIB/common-functions -source $_LIB/img-functions - -echo "Extracting kernel + ramdisk from $IMAGE_FILE to $OUT_PFX-vmlinuz and $OUT_PFX-initrd in $OUT_DIR" - -ensure_nbd - -# sets WORK_DIR -mount_qcow_image $IMAGE_FILE - -select_boot_kernel_initrd $WORK_DIR - -sudo cp $BOOTDIR/$KERNEL $OUT_DIR/$OUT_PFX-vmlinuz -sudo cp $BOOTDIR/$RAMDISK $OUT_DIR/$OUT_PFX-initrd -sudo chmod a+r $OUT_DIR/$OUT_PFX-vmlinuz -sudo chmod a+r $OUT_DIR/$OUT_PFX-initrd - -unmount_qcow_image diff --git a/doc/source/developer/components.rst b/doc/source/developer/components.rst index e07aea84..3ce491b4 100644 --- a/doc/source/developer/components.rst +++ b/doc/source/developer/components.rst @@ -24,12 +24,6 @@ Components ramdisk-image-create -o deploy.ramdisk deploy-ironic -`disk-image-get-kernel filename` - - **DEPRECATED** Extract the appropriate kernel and ramdisk to use when doing - PXE boot using filename as the image for a machine. Consider using the - :ref:`element-baremetal` element, rather than this tool. - `element-info` diff --git a/setup.cfg b/setup.cfg index aa9552f9..ec576817 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,7 +28,6 @@ packages = scripts = bin/dib-lint bin/disk-image-create - bin/disk-image-get-kernel bin/element-info bin/ramdisk-image-create data_files =