From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1JWsic-0003QD-6b for mharc-grub-devel@gnu.org; Wed, 05 Mar 2008 07:27:34 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JWsiZ-0003M0-RH for grub-devel@gnu.org; Wed, 05 Mar 2008 07:27:31 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JWsiY-0003Iy-HL for grub-devel@gnu.org; Wed, 05 Mar 2008 07:27:31 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JWsiY-0003Ie-Bt for grub-devel@gnu.org; Wed, 05 Mar 2008 07:27:30 -0500 Received: from mx3.rz.ruhr-uni-bochum.de ([134.147.64.33]) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1JWsiX-000246-Oh for grub-devel@gnu.org; Wed, 05 Mar 2008 07:27:30 -0500 X-Queued: (qmail 24031 invoked by uid 271); 5 Mar 2008 12:27:27 -0000 X-Qmailscanner: from 134.147.252.214 by mx3.rz.ruhr-uni-bochum.de (envelope-from , uid 80) with qmail-scanner-2.01 (sophie: 3.05/2.71/4.27. Clear:RC:1(134.147.252.214):. Processed in 0.039623 secs); 05 Mar 2008 12:27:27 -0000 Received: from router.leat.ruhr-uni-bochum.de (134.147.252.214) by mx3.rz.ruhr-uni-bochum.de with SMTP; 5 Mar 2008 12:27:27 -0000 Received: from [134.147.55.45] (frodo.leat.ruhr-uni-bochum.de [134.147.55.45]) by router.leat.ruhr-uni-bochum.de (8.12.2/8.12.2/SuSE Linux 0.6) with ESMTP id m25CXZ1l022322; Wed, 5 Mar 2008 13:33:35 +0100 Message-ID: <47CE91CC.5010603@leat.rub.de> Date: Wed, 05 Mar 2008 13:27:56 +0100 From: Fabian Greffrath User-Agent: Thunderbird 2.0.0.12 (Windows/20080213) MIME-Version: 1.0 To: The development of GRUB 2 , Robert Millan References: <20080224152237.GB25984@thorin> <47C28F0D.7090703@leat.rub.de> <20080225142009.GJ14597@thorin> <47C66239.9020709@leat.rub.de> <20080228101000.GA350@thorin> <47C68CBD.8020601@leat.rub.de> <20080228104156.GJ350@thorin> <47C69F1D.9090405@leat.rub.de> <20080228170738.GB26926@thorin> <47C7C349.6040303@leat.rub.de> <20080303210656.GD22431@thorin> In-Reply-To: <20080303210656.GD22431@thorin> Content-Type: multipart/mixed; boundary="------------010104010908000208020308" X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6 Cc: Subject: [NEW PATCH] os-prober output parser X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2008 12:27:32 -0000 This is a multi-part message in MIME format. --------------010104010908000208020308 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit I have improved the script a little bit; in particular I moved the tests for the required software to the beginning of the script and let it gracefully 'exit 0' if anything is missing. Let me comment on these tests: - The first test (lines 19-22) is to check if grub-probe is recent enough to support the '--device' option. I have changed this to grep for it in the '--help' output instead of test-probing a given device, since you never know if a device.map allready exists (imaging booting from knoppix). - I have changed the second test (24-27) to not utilize the 'which' utility anymore. It's in the debianutils package and I don't know if there's a chance that this is installed on non-Debian systems. On the other hand, we are utilizing os-prober which is Debian-only at the moment... - The third test (30-33) is redundant, strictly speaking. The script will never enter the for/do loop if the os-prober output is empty. However, I found it reasonably to 'exit 0' before even attempting to enter the loop, YMMV. If it doesn't suit you, it can be removed safely. Furthermore I have removed the 'hurd' stub. For the time beeing, HURD kernels remain unsupported and throw a warning message just like macos* and all other !linux and !chain operating systems. Best Regards, Fabian -- Dipl.-Phys. Fabian Greffrath Ruhr-Universität Bochum Lehrstuhl für Energieanlagen und Energieprozesstechnik (LEAT) Universitätsstr. 150, IB 3/134 D-44780 Bochum Telefon: +49 (0)234 / 32-26334 Fax: +49 (0)234 / 32-14227 E-Mail: greffrath@leat.ruhr-uni-bochum.de --------------010104010908000208020308 Content-Type: text/plain; name="30_os-prober" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="30_os-prober" 77u/IyEgL2Jpbi9zaCAtZQoKIyB1cGRhdGUtZ3J1YiBoZWxwZXIgc2NyaXB0LgojIENvcHly aWdodCAoQykgMjAwNiwyMDA3LDIwMDggIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5j LgojCiMgR1JVQiBpcyBmcmVlIHNvZnR3YXJlOiB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBh bmQvb3IgbW9kaWZ5CiMgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQ dWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkKIyB0aGUgRnJlZSBTb2Z0d2FyZSBGb3Vu ZGF0aW9uLCBlaXRoZXIgdmVyc2lvbiAzIG9mIHRoZSBMaWNlbnNlLCBvcgojIChhdCB5b3Vy IG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCiMKIyBHUlVCIGlzIGRpc3RyaWJ1dGVkIGlu IHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCiMgYnV0IFdJVEhPVVQgQU5ZIFdB UlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKIyBNRVJDSEFO VEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhl CiMgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KIwojIFlv dSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1Ymxp YyBMaWNlbnNlCiMgYWxvbmcgd2l0aCBHUlVCLiAgSWYgbm90LCBzZWUgPGh0dHA6Ly93d3cu Z251Lm9yZy9saWNlbnNlcy8+LgoKaWYgWyAteiAiYGdydWItcHJvYmUgLS1oZWxwIDI+IC9k ZXYvbnVsbCB8IGdyZXAgJ1wtZCxcIFwtXC1kZXZpY2UnYCIgXSA7IHRoZW4KICAjIGdydWIt cHJvYmUgZG9lcyBub3Qgc3VwcG9ydCAnLS1kZXZpY2UnIG9wdGlvbiB5ZXQgKGludHJvZHVj ZWQgaW4gMS45NisyMDA4MDIyOCkKICBleGl0IDAKZmkKCmlmIFsgLXggL3Vzci9iaW4vb3Mt cHJvYmVyIC1hIC14IC91c3IvYmluL2xpbnV4LWJvb3QtcHJvYmVyIF0gOyB0aGVuIDogOyBl bHNlCiAgIyBvcy1wcm9iZXIvbGludXgtYm9vdC1wcm9iZXIgbm90IGluc3RhbGxlZAogIGV4 aXQgMApmaQoKT1NQUk9CRUQ9ImBvcy1wcm9iZXIgMj4gL2Rldi9udWxsIHwgdHIgJyAnICde JyB8IHBhc3RlIC1zIC1kICcgJ2AiCmlmIFsgLXogIiR7T1NQUk9CRUR9IiBdIDsgdGhlbgog ICMgZW1wdHkgb3MtcHJvYmVyIG91dHB1dCwgbm90aGluZyBkb2luZwogIGV4aXQgMApmaQoK Zm9yIE9TIGluICR7T1NQUk9CRUR9IDsgZG8KICBERVZJQ0U9ImBlY2hvICR7T1N9IHwgY3V0 IC1kICc6JyAtZiAxYCIKICBMT05HTkFNRT0iYGVjaG8gJHtPU30gfCBjdXQgLWQgJzonIC1m IDIgfCB0ciAnXicgJyAnYCIKICBMQUJFTD0iYGVjaG8gJHtPU30gfCBjdXQgLWQgJzonIC1m IDMgfCB0ciAnXicgJyAnYCIKICBCT09UPSJgZWNobyAke09TfSB8IGN1dCAtZCAnOicgLWYg NGAiCgogIGlmIFsgLXogIiR7TE9OR05BTUV9IiBdIDsgdGhlbgogICAgTE9OR05BTUU9IiR7 TEFCRUx9IgogIGZpCgogIGVjaG8gIkZvdW5kICR7TE9OR05BTUV9IG9uICR7REVWSUNFfSIg PiYyCgogIGNhc2UgJHtCT09UfSBpbgogICAgY2hhaW4pCiAgICAgIENIQUlOUk9PVD0iYGdy dWItcHJvYmUgLS10YXJnZXQ9ZHJpdmUgLS1kZXZpY2UgJHtERVZJQ0V9IDI+IC9kZXYvbnVs bGAiCgogICAgICBjYXQgPDwgRU9GCm1lbnVlbnRyeSAiJHtMT05HTkFNRX0gKG9uICR7REVW SUNFfSkiIHsKCXNldCByb290PSR7Q0hBSU5ST09UfQoJY2hhaW5sb2FkZXIgKzEKfQpFT0YK ICAgIDs7CiAgICBsaW51eCkKICAgICAgTElOVVhQUk9CRUQ9ImBsaW51eC1ib290LXByb2Jl ciAke0RFVklDRX0gMj4gL2Rldi9udWxsIHwgdHIgJyAnICdeJyB8IHBhc3RlIC1zIC1kICcg J2AiCiAKICAgICAgZm9yIExJTlVYIGluICR7TElOVVhQUk9CRUR9IDsgZG8KICAgICAgICBM Uk9PVD0iYGVjaG8gJHtMSU5VWH0gfCBjdXQgLWQgJzonIC1mIDFgIgogICAgICAgIExCT09U PSJgZWNobyAke0xJTlVYfSB8IGN1dCAtZCAnOicgLWYgMmAiCiAgICAgICAgTExBQkVMPSJg ZWNobyAke0xJTlVYfSB8IGN1dCAtZCAnOicgLWYgMyB8IHRyICdeJyAnICdgIgogICAgICAg IExLRVJORUw9ImBlY2hvICR7TElOVVh9IHwgY3V0IC1kICc6JyAtZiA0YCIKICAgICAgICBM SU5JVFJEPSJgZWNobyAke0xJTlVYfSB8IGN1dCAtZCAnOicgLWYgNWAiCiAgICAgICAgTFBB UkFNUz0iYGVjaG8gJHtMSU5VWH0gfCBjdXQgLWQgJzonIC1mIDYtIHwgdHIgJ14nICcgJ2Ai CgogICAgICAgIExJTlVYUk9PVD0iYGdydWItcHJvYmUgLS10YXJnZXQ9ZHJpdmUgLS1kZXZp Y2UgJHtMQk9PVH0gMj4gL2Rldi9udWxsYCIKCiAgICAgICAgaWYgWyAteiAiJHtMTEFCRUx9 IiBdIDsgdGhlbgogICAgICAgICAgTExBQkVMPSIke0xPTkdOQU1FfSIKICAgICAgICBmaQoK ICAgICAgICBjYXQgPDwgRU9GCm1lbnVlbnRyeSAiJHtMTEFCRUx9IChvbiAke0RFVklDRX0p IiB7CglzZXQgcm9vdD0ke0xJTlVYUk9PVH0KCWxpbnV4ICR7TEtFUk5FTH0gJHtMUEFSQU1T fQpFT0YKICAgICAgICBpZiBbIC1uICIke0xJTklUUkR9IiBdIDsgdGhlbgogICAgICAgICAg Y2F0IDw8IEVPRgoJaW5pdHJkICR7TElOSVRSRH0KRU9GCiAgICAgICAgZmkKICAgICAgICBj YXQgPDwgRU9GCn0KRU9GCiAgICAgIGRvbmUKICAgIDs7CiAgICBodXJkfCopCiAgICAgIGVj aG8gIiAgJHtMT05HTkFNRX0gaXMgbm90IHlldCBzdXBwb3J0ZWQgYnkgdXBkYXRlLWdydWIu IiA+JjIKICAgIDs7CiAgZXNhYwpkb25lCg== --------------010104010908000208020308--