← Back to branch summary

~ubuntu-branches/ubuntu/trusty/os-prober/trusty

« back to all changes in this revision

Viewing changes to linux-boot-probes/mounted/common/90fallback

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson, Joey Hess, Colin Watson
  • Date: 2010-06-28 18:01:00 UTC
  • Revision ID: james.westby@ubuntu.com-20100628180100-a2vbxsxq2nahsdqf
Tags: 1.39
http://bugs.debian.org/582257
https://launchpad.net/bugs/420900
[ Joey Hess ]
* Fix FreeDOS test to use case-insensative filename lookup
  as was already done for all other DOS/Windows tests. Closes: #582257
  (Thanks, Harald Dunkel)

[ Colin Watson ]
* Handle Dracut-generated initramfs names in linux-boot-prober fallback
  test (thanks, Piscium; LP: #420900).

Show diffs side-by-side

added added

removed removed

Lines of Context:
linux-boot-probes/mounted/common/90fallback
28
28
                        # systems, since kernel.img could conceivably be a
29
29
                        # kernel itself.
30
30
                        initrdname2=$(echo "$kernfile" | sed -n 's/vmlinu[zx]\([0-9][0-9]*\)/kernel\1/p' | sed 's/$/.img/')
 
31
                        # Dracut initramfses are named differently again.
 
32
                        initrdname3=$(echo "$kernfile" | sed "s/vmlinu[zx]/initramfs\*/" | sed 's/$/.img/')
31
33
                        foundinitrd=0
32
 
                        for initrd in $(eval ls "$initrdname" "$initrdname2" 2>/dev/null); do
 
34
                        for initrd in $(eval ls "$initrdname" "$initrdname2" "$initrdname3" 2>/dev/null); do
33
35
                                if [ -f "$initrd" ] && [ ! -L "$initrd" ]; then
34
36
                                        initrd=$(echo "$initrd" | sed "s!^$mpoint!!")
35
37
                                        result "$partition:$kernbootpart::$kernbasefile:$initrd:root=$mappedpartition"