From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NfwO8-00038h-F3 for mharc-grub-devel@gnu.org; Fri, 12 Feb 2010 09:20:56 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NfwO6-00037K-S5 for grub-devel@gnu.org; Fri, 12 Feb 2010 09:20:54 -0500 Received: from [140.186.70.92] (port=37929 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfwO4-00032x-KP for grub-devel@gnu.org; Fri, 12 Feb 2010 09:20:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NfwNz-00035b-3T for grub-devel@gnu.org; Fri, 12 Feb 2010 09:20:47 -0500 Received: from aa.81.b6.static.xlhost.com ([207.182.129.170]:38614 helo=wombat.diezmil.com) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NfwNy-00035J-Ro for grub-devel@gnu.org; Fri, 12 Feb 2010 09:20:47 -0500 Received: from wombat (wombat [127.0.0.1]) by wombat.diezmil.com (8.14.2/8.14.2) with ESMTP id o1CEKhBt019476 for ; Fri, 12 Feb 2010 09:20:44 -0500 Date: Fri, 12 Feb 2010 09:20:43 -0500 From: gburanov@gmail.com To: grub-devel@gnu.org Message-ID: <14260026.21265984443856.JavaMail.root@wombat> In-Reply-To: <4B7425C0.3060309@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: Re: Re: [patch] GRUB possible patches X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Feb 2010 14:20:55 -0000 Hello, > It is. Can you write a ChangeLog entry? Done > ;1 is so called version. Basically all terminating ; have to be > stripped but only if filename doesn't come from rockridge or joliet. > Apparently nobody uses grub2 on non-rockridge, non-joliet iso. While > this bug should be fixed using grub from plain iso isn't supported due > to filename length limitation. I found out that I got versioning even on joliet CD. I created CD using "Small CD Writer". You can try the same. I created patch for that as well, but of course you can skip it. Regards, Georgy PS: My Patch === modified file 'ChangeLog' --- ChangeLog 2010-02-10 19:27:12 +0000 +++ ChangeLog 2010-02-12 14:14:46 +0000 @@ -1,3 +1,8 @@ +2010-02-12 Georgy Buranov + + * disk/efi/efidisk.c (grub_efidisk_get_device_name): Fix bug obtaining device name of the whole disk + * fs/iso9660.c (grub_iso9660_iterate_dir): Remove file versions from ISO9660&Joliet file names + 2010-02-10 Vladimir Serbinenko Pass SIMPLE framebuffer size in bytes and not 64K blocks. === modified file 'disk/efi/efidisk.c' --- disk/efi/efidisk.c 2010-01-20 08:12:47 +0000 +++ disk/efi/efidisk.c 2010-02-12 14:05:23 +0000 @@ -825,7 +825,7 @@ if (! disk) return 1; - if (disk->id == GRUB_DISK_DEVICE_EFIDISK_ID) + if (disk->dev->id == GRUB_DISK_DEVICE_EFIDISK_ID) { struct grub_efidisk_data *d; === modified file 'fs/iso9660.c' --- fs/iso9660.c 2010-01-27 03:11:20 +0000 +++ fs/iso9660.c 2010-02-12 14:13:01 +0000 @@ -615,9 +615,6 @@ if (!filename) { name[dirent.namelen] = '\0'; - filename = grub_strrchr (name, ';'); - if (filename) - *filename = '\0'; if (dirent.namelen == 1 && name[0] == 0) filename = "."; @@ -640,6 +637,14 @@ filename_alloc = 1; } + + if (!dir->data->rockridge) + { + // On simple ISO 9660 disks and on joliet, we need to remove file version, if any + char* lastSymbol = grub_strrchr (filename, ';'); + if (lastSymbol) + *lastSymbol = '\0'; + } if (hook (filename, type, node)) { -- This message was sent on behalf of gburanov@gmail.com at openSubscriber.com http://www.opensubscriber.com/message/grub-devel@gnu.org/13415591.html