[ostree] 15_ostree: only look for ostree initramfs



commit c6ea1bedd5867fecef48ea1c04bd2ed1aad52de2
Author: Carl-Anton Ingmarsson <ca ingmarsson gmail com>
Date:   Thu Apr 26 16:49:04 2012 +0200

    15_ostree: only look for ostree initramfs
    
    also only add a kernel entry if we find a corresponding initramfs

 gnomeos/15_ostree |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/gnomeos/15_ostree b/gnomeos/15_ostree
index dc6fb9f..08330d6 100755
--- a/gnomeos/15_ostree
+++ b/gnomeos/15_ostree
@@ -53,20 +53,14 @@ while [ "x${kernels}" != x ]; do
   linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
 
   initrd=
-  for i in "initrd.img-${version}" "initrd-${version}.img" \
-	   "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
+  for i in "initramfs-ostree-${version}.img" "initramfs-ostree-${alt_version}.img"; do
     if test -e "${dirname}/${i}" ; then
       initrd="$i"
+      ostree_linux_entry "GNOMEOS 3.4" "${version}" \
+	        "${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_LINUX_DEFAULT}"
       break
     fi
   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' ' '`
 done



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]