sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix openSUSE kernel/initrd detection"

Browse Source
This commit is contained in:
Jenkins 2014-09-08 11:41:32 +00:00 committed by Gerrit Code Review
commit 63826e02fb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/img-functions
View File

@ -164,8 +164,8 @@ function select_boot_kernel_initrd () {
KERNEL=${KERNEL:-$(basename `ls -1rv $BOOTDIR/vmlinuz* | head -1`)} KERNEL=${KERNEL:-$(basename `ls -1rv $BOOTDIR/vmlinuz* | head -1`)}
RAMDISK=${RAMDISK:-$(basename `ls -1rv $BOOTDIR/initrd* | head -1`)} RAMDISK=${RAMDISK:-$(basename `ls -1rv $BOOTDIR/initrd* | head -1`)}
elif [ -f $TARGET_ROOT/etc/SuSE-release ]; then elif [ -f $TARGET_ROOT/etc/SuSE-release ]; then
KERNEL=vmlinuz KERNEL=$(basename $(readlink -e $BOOTDIR/vmlinuz))
RAMDISK=initrd RAMDISK=$(basename $(readlink -e $BOOTDIR/initrd))
else else
echo "ERROR: Unable to detect operating system" echo "ERROR: Unable to detect operating system"
exit 1 exit 1