diff options
| author | Brian Dolbec <dolsen@gentoo.org> | 2012-10-16 23:20:26 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2012-10-16 23:20:26 -0700 |
| commit | c5c2032602adf640f3b9841b6370046f3ea01632 (patch) | |
| tree | ed31eaf8e1c9fac0a729d3146a2537d1ac94b032 | |
| parent | c1d3b0799e7fa4effd62372545f7a4a962f31bac (diff) | |
| download | layman-c5c2032602adf640f3b9841b6370046f3ea01632.tar.gz layman-c5c2032602adf640f3b9841b6370046f3ea01632.tar.bz2 layman-c5c2032602adf640f3b9841b6370046f3ea01632.zip | |
update the make.conf path to the new /etc/portage one. Thanks kurly for reporting it.
| -rw-r--r-- | doc/layman.8.txt | 16 | ||||
| -rw-r--r-- | layman/updater.py | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/layman.8.txt b/doc/layman.8.txt index 0558b67..758c14f 100644 --- a/doc/layman.8.txt +++ b/doc/layman.8.txt @@ -180,16 +180,16 @@ make.conf:: This is the *portage* configuration file that *layman* will modify in order to make the new overlays available within *portage*. The default is '%(storage)s/make.conf'. You could - also specify '/etc/make.conf' directly. But that would mean + also specify '/etc/portage/make.conf' directly. But that would mean that you have an external program trying to automatically set variables within this very central configuration file. Since I consider that dangerous I prefer having a very small external file that only contains the setting for *PORTDIR_OVERLAY*. This file is then sourced at the end of - '/etc/make.conf'. This is the reason why *layman* suggests running + '/etc/portage/make.conf'. This is the reason why *layman* suggests running the following *after* it has been installed. - echo 'source /var/lib/layman/make.conf' >> /etc/make.conf + echo 'source /var/lib/layman/make.conf' >> /etc/portage/make.conf @@ -279,18 +279,18 @@ HANDLING /ETC/MAKE.CONF ~~~~~~~~~~~~~~~~~~~~~~~ Since *layman* is designed to automatically handle the inclusion of overlays into your system it needs to be able to modify the -*PORTDIR_OVERLAY* variable in your '/etc/make.conf' file. -But '/etc/make.conf' is a very central and essential configuration +*PORTDIR_OVERLAY* variable in your '/etc/portage/make.conf' file. +But '/etc/portage/make.conf' is a very central and essential configuration file for a Gentoo system. Automatically modifying this file would be somewhat dangerous. You can allow *layman* to do this by setting the make_conf variable in the configuration file to -'/etc/make.conf'. +'/etc/portage/make.conf'. A much safer and in fact recommended solution to the problem is to let *layman* handle an external file that only contains the *PORTDIR_OVERLAY* variable and is sourced within the standard -'/etc/make.conf' file. Just add the following line to the end of -your '/etc/make.conf' file: +'/etc/portage/make.conf' file. Just add the following line to the end of +your '/etc/portage/make.conf' file: ------------------------------------------- source /var/lib/layman/make.conf diff --git a/layman/updater.py b/layman/updater.py index 746a061..1108ea3 100644 --- a/layman/updater.py +++ b/layman/updater.py @@ -126,7 +126,7 @@ class Main(object): "", "If this is the very first overlay you add with layman,", "you need to append the following statement to your", - "/etc/make.conf file:", + "/etc/portage/make.conf file:", "", " source /var/lib/layman/make.conf", "", |