2006-08-19 Robert Millan <rmh@aybabtu.com>

* util/i386/pc/grub-install.in: Skip menu.lst when removing
	/boot/grub/*.lst.
	* util/i386/pc/getroot.c: Don't recurse into dotdirs (e.g. ".static").
	* util/i386/pc/grub-mkdevicemap.c: Make sure the floppy device exists
	before adding it to device.map.
This commit is contained in:
robertmh 2006-09-14 18:52:50 +00:00
parent 01b82a64e2
commit 2952da5dda
4 changed files with 17 additions and 4 deletions

View file

@ -160,9 +160,11 @@ find_root_device (const char *dir, dev_t dev)
/* Don't follow symbolic links. */
continue;
if (S_ISDIR (st.st_mode))
if (S_ISDIR (st.st_mode) && ent->d_name[0] != '.')
{
/* Find it recursively. */
/* Find it recursively, but avoid dotdirs (like ".static") since they
could contain duplicates, which would later break the
pathname-based check */
char *res;
res = find_root_device (ent->d_name, dev);