use installinitrd to install the upgrade.img initramfs so that we get correct permissions

This commit is contained in:
Dennis Gilmore 2012-11-22 19:55:32 -06:00
parent 69c251aa20
commit 138cb06cd5
4 changed files with 6 additions and 6 deletions

View File

@ -33,7 +33,7 @@ mkdir ${KERNELDIR}
installinitrd images-${kernel.flavor}-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
## install upgrade image
install ${kernel.upgrade.img} ${KERNELDIR}/upgrade-${kernel.flavor}.img
installinitrd ${kernel.upgrade.img} ${KERNELDIR}/upgrade-${kernel.flavor}.img
treeinfo images-${kernel.flavor}-${basearch} upgrade ${KERNELDIR}/upgrade-${kernel.flavor}.img
## create U-Boot wrapped images
@ -60,7 +60,7 @@ mkdir ${KERNELDIR}
installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
## install upgrade image
install ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
installinitrd ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
treeinfo images-${basearch} upgrade ${KERNELDIR}/upgrade.img
## create U-Boot wrapped images

View File

@ -67,7 +67,7 @@ install ${configdir}/magic ${BOOTDIR}
installinitrd images-${kernel.arch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
## upgrade image
install ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
installinitrd ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
treeinfo images-${kernel.arch} upgrade ${KERNELDIR}/upgrade.img
## install arch-specific bootloader config

View File

@ -25,7 +25,7 @@ installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/kernel.img
installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
## upgrader image
install ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
installinitrd ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
treeinfo images-${basearch} upgrade ${KERNELDIR}/upgrade.img
## s390 needs some extra boot config

View File

@ -34,13 +34,13 @@ mkdir ${KERNELDIR}
## i386 PAE
installkernel images-xen ${kernel.path} ${KERNELDIR}/vmlinuz-${kernel.flavor}
installinitrd images-xen ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
install ${kernel.upgrade.path} ${KERNELDIR}/upgrade-${kernel.flavor}.img
installinitrd ${kernel.upgrade.path} ${KERNELDIR}/upgrade-${kernel.flavor}.img
treeinfo images-xen upgrade ${KERNELDIR}/upgrade-${kernel.flavor}.img
%else:
## normal i386, x86_64
installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
install ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
installinitrd ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
treeinfo images-${basearch} upgrade ${KERNELDIR}/upgrade.img
%endif
%endfor