[Top][All Lists]

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

[Patch] File name transformations & grub-mkconfig --root-directory

From: Grégoire Sutre
Subject: [Patch] File name transformations & grub-mkconfig --root-directory
Date: Mon, 24 May 2010 17:00:56 +0200
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv: Gecko/20100411 Icedove/3.0.4


The attached patch fixes problems with file name transformations, which
are partly broken in trunk.  With this patch, several installations of
grub can coexist with no conflict (at least they should), sharing
however the same configuration directory (etc/grub.d).

It also adds --root-directory support to grub-mkconfig, and makes
grub-mkconfig_lib's prepare_grub_to_access_device load partmap modules.

The main changes in the patch are:

- configure defines three new variables, accounting for transformations:
  . pkgdatadir       (${datadir}/grub)
  . pkglibrootdir    (${libdir}/grub)
  . defaultbootdir   (/boot/grub, or /grub if OS is NetBSD or OpenBSD)

- these variables are used in Makefile and in util/... scripts

- output of --help and of --version in scripts uses `basename $0` and
  the same format as the one in binaries.

- in Makefile, the help2man, .info, and .mo rules also account for
  file name transformations.

- grub-mkconfig exports GRUB_DIR, which is used by grub-mkconfig_lib
  and by 00_header.

- prepare_grub_to_access_device also loads necessary part_* modules,
  which is required when e.g. only part_msdos is included in core.img
  but the file to be accessed is in (hd0,msdos1,bsd5).

The other changes are cosmetic (with no intended functional change).

Note: this patch also contains my small Unifont search patch previously
sent to the list.


p.s. This corresponds to my branch gsutre/fixes, where the
     modifications are split into small commits.

Attachment: file-name-trans.diff
Description: Text Data

reply via email to

[Prev in Thread] Current Thread [Next in Thread]