packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

15_ostree: only look for ostree initramfs 

also only add a kernel entry if we find a corresponding initramfs
This commit is contained in:
Carl-Anton Ingmarsson 2012-04-26 16:49:04 +02:00 committed by Colin Walters
parent f487500e50
commit c6ea1bedd5
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnomeos/15_ostree
View File

@ -53,20 +53,14 @@ while [ "x${kernels}" != x ]; do
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
initrd= initrd=
for i in "initrd.img-${version}" "initrd-${version}.img" \ for i in "initramfs-ostree-${version}.img" "initramfs-ostree-${alt_version}.img"; do
"initrd-${version}" "initramfs-${version}.img" \
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
"initramfs-genkernel-${version}" \
"initramfs-genkernel-${alt_version}"; do
if test -e "${dirname}/${i}" ; then if test -e "${dirname}/${i}" ; then
initrd="$i" initrd="$i"
ostree_linux_entry "GNOMEOS 3.4" "${version}" \
"${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_LINUX_DEFAULT}"
break break
fi fi
done done
ostree_linux_entry "GNOMEOS 3.4" "${version}" \
"${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_LINUX_DEFAULT}"
kernels=`echo $kernels | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` kernels=`echo $kernels | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
done done