X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fmodules-load.d.xml;h=91d230c35a9af26e681027d4693ed87957abcfb9;hb=88e995fd720a93460e7c3f38ac24512e6d96b3e8;hp=b2f15dc7b6f6966ca201839da0692cc5da3d6dee;hpb=db1413d7380acacc4e50faf801ca0d401da89764;p=elogind.git diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml index b2f15dc7b..91d230c35 100644 --- a/man/modules-load.d.xml +++ b/man/modules-load.d.xml @@ -7,16 +7,16 @@ Copyright 2011 Lennart Poettering systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. systemd is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . --> @@ -46,9 +46,9 @@ - /usr/lib/modules-load.d/*.conf /etc/modules-load.d/*.conf /run/modules-load.d/*.conf + /usr/lib/modules-load.d/*.conf @@ -74,7 +74,9 @@ newlines. Empty lines and lines whose first non-whitespace character is # or ; are ignored. - Files in /etc/ overwrite + Each configuration file is named in the style of + <program>.conf. + Files in /etc/ overwrite files with the same name in /usr/lib/. Files in /run overwrite files with the same name in /etc/ and