openstack/deb-python-diskimage-builder
Code Issues Proposed changes

Add RedHat support for disk-image-get-kernel.

Browse Source 
RedHat and Debian based systems have different binary names.

Change-Id: I5162204759fbc4ff167d1584294c9936ab7df4c8
This commit is contained in:
Lucas Alvares Gomes
2013-05-24 12:50:11 +01:00
parent 5695fbd39e
commit c28cb1b5d8
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bin/disk-image-get-kernel
View File

@@ -2,13 +2,13 @@
# #
# Copyright 2012 Hewlett-Packard Development Company, L.P. # Copyright 2012 Hewlett-Packard Development Company, L.P.
# All Rights Reserved. # All Rights Reserved.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain
# a copy of the License at # a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -75,8 +75,19 @@ mount_qcow_image $IMAGE_FILE
# Dig up the initrd and kernel to use. # Dig up the initrd and kernel to use.
BOOTDIR="$WORK_DIR/boot" BOOTDIR="$WORK_DIR/boot"
KERNEL=$(basename `ls -1 $BOOTDIR/vmlinuz*generic | sort -n | tail -1`) KERNEL=
RAMDISK=$(basename `ls -1 $BOOTDIR/initrd*generic | sort -n | tail -1`) RAMDISK=
if [ -f $WORK_DIR/etc/redhat-release ]; then
KERNEL=$(basename `ls -1 $BOOTDIR/vmlinuz* | sort -n | tail -1`)
RAMDISK=$(basename `ls -1 $BOOTDIR/initramfs* | sort -n | tail -1`)
elif [ -f $WORK_DIR/etc/debian_version ]; then
KERNEL=$(basename `ls -1 $BOOTDIR/vmlinuz*generic | sort -n | tail -1`)
RAMDISK=$(basename `ls -1 $BOOTDIR/initrd*generic | sort -n | tail -1`)
else
echo "ERROR: Unable to detect operating system"
exit 1
fi
sudo cp $BOOTDIR/$KERNEL $OUT_DIR/$OUT_PFX-vmlinuz sudo cp $BOOTDIR/$KERNEL $OUT_DIR/$OUT_PFX-vmlinuz
sudo cp $BOOTDIR/$RAMDISK $OUT_DIR/$OUT_PFX-initrd 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-vmlinuz