diff options
| author | Jeremy Katz <katzj@redhat.com> | 2008-03-26 09:57:03 -0400 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2008-03-26 16:42:24 -0400 |
| commit | ff43517869813269ff802aa031e75895bebc4375 (patch) | |
| tree | 190d2738c8dd5203bd02a59e219497ea2b15730c /scripts | |
| parent | 8d923fe3196e059263ae41da620f086471b8e28f (diff) | |
| download | anaconda-ff43517869813269ff802aa031e75895bebc4375.tar.gz anaconda-ff43517869813269ff802aa031e75895bebc4375.tar.xz anaconda-ff43517869813269ff802aa031e75895bebc4375.zip | |
Make a little bit more future proof for kernel version changing
uname -r as reported by the kernel should be figured out based on some files
that get written, not by depending on "knowing" that it's version-release
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mk-images | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index cebb27921..88af4565b 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -780,9 +780,9 @@ for KERNELARCH in $arches; do if [ "${kernelvers}" = "kernel-xen" ]; then kerneltag="xen" ; fi - version=$(rpm --nodigest --nosignature --qf '%{VERSION}-%{RELEASE}' -qp $kpackage)${kerneltag} + vmlinuz=$(rpm --nodigest --nosignature -qpl $kpackage |grep ^/boot/vmlinuz | head -n 1) + version=${vmlinuz##/boot/vmlinuz-} arch=$(rpm --nodigest --nosignature --qf '%{ARCH}\n' -qp $kpackage) - echo "unpacking $kpackage" rpm2cpio $kpackage | (cd $KERNELROOT; cpio --quiet -iumd) rm -f $kpackage |