openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "ramdisk-image-create: add support for vmlinux file"

This commit is contained in:
Jenkins 2015-02-04 06:51:51 +00:00 committed by Gerrit Code Review
parent d67e2de859 57705694e7
commit 8e313b112f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/ramdisk/post-install.d/99-build-ramdisk
View File

@ -42,5 +42,5 @@ save_image /tmp/ramdisk
# In the past save_image did this for us. If EXIT handler is not
# reset ramdisk image builds fail.
trap EXIT
cp /boot/vmlinuz-${KERNEL_VERSION} /tmp/kernel
cp /boot/vmlinu[zx]-${KERNEL_VERSION} /tmp/kernel
chmod o+r /tmp/kernel

2
lib/img-functions
View File

@ -159,7 +159,7 @@ function select_boot_kernel_initrd () {
exit 1
fi
elif [ -f $TARGET_ROOT/etc/debian_version ]; then
KERNEL=$(basename $(ls -1rv $BOOTDIR/vmlinuz*generic 2>/dev/null || ls -1rv $BOOTDIR/vmlinuz* | head -1))
KERNEL=$(basename $(ls -1rv $BOOTDIR/vmlinu*generic 2>/dev/null || ls -1rv $BOOTDIR/vmlinu* | head -1))
RAMDISK=$(basename $(ls -1rv $BOOTDIR/initrd*generic 2>/dev/null || ls -1rv $BOOTDIR/initrd* | head -1))
elif [ -f $TARGET_ROOT/etc/SuSE-release ]; then
KERNEL=$(basename $(readlink -e $BOOTDIR/vmlinuz))

4
lib/ramdisk-functions
View File

@ -226,10 +226,10 @@ function populate_udev () {
}
function find_kernel_version () {
_TMP=$(ls /boot/vmlinuz-* | sort | tail -1)
_TMP=$(ls /boot/vmlinu* | sort | tail -1)
if [ "$_TMP" == "" ]; then
echo "Unable to find a suitable kernel" >>/dev/stderr
exit 1
fi
echo ${_TMP##/boot/vmlinuz-}
echo ${_TMP##/boot/vmlinu[zx]-}
}