From cd80f19c5e5d7785ce12972a5e0607c2904919a0 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Mon, 27 Oct 2014 19:39:35 +0100 Subject: [PATCH] doc: Improve Configuration file section --- README.md | 17 +++++++++-------- novaboot | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 1e16f59..514c3ee 100644 --- a/README.md +++ b/README.md @@ -654,14 +654,15 @@ The following variables are interpreted in the novaboot script: # CONFIGURATION FILE Novaboot can read its configuration from one or more files. By -default, novaboot looks for files named `.novaboot` as described in -["Configuration reading phase"](#configuration-reading-phase). Alternatively, configuration file -location can be specified with the **-c** switch or with the -NOVABOOT\_CONFIG environment variable. The configuration file has Perl -syntax and should set values of certain Perl variables. The current -configuration can be dumped with the **--dump-config** switch. Some -configuration variables can be overridden by environment variables -(see below) or by command line switches. +default, novaboot looks for files in `/etc/novaboot.d` and files +named `.novaboot` as described in ["Configuration reading phase"](#configuration-reading-phase). +Alternatively, configuration file location can be specified with the +**-c** switch or with the NOVABOOT\_CONFIG environment variable. The +configuration file has Perl syntax (i.e. it is better to put `1;` as +a last line) and should set values of certain Perl variables. The +current configuration can be dumped with the **--dump-config** switch. +Some configuration variables can be overridden by environment +variables (see below) or by command line switches. Supported configuration variables include: diff --git a/novaboot b/novaboot index 5c9944d..7606fd8 100755 --- a/novaboot +++ b/novaboot @@ -1829,14 +1829,15 @@ intermediate output. =head1 CONFIGURATION FILE Novaboot can read its configuration from one or more files. By -default, novaboot looks for files named F<.novaboot> as described in -L. Alternatively, configuration file -location can be specified with the B<-c> switch or with the -NOVABOOT_CONFIG environment variable. The configuration file has Perl -syntax and should set values of certain Perl variables. The current -configuration can be dumped with the B<--dump-config> switch. Some -configuration variables can be overridden by environment variables -(see below) or by command line switches. +default, novaboot looks for files in F and files +named F<.novaboot> as described in L. +Alternatively, configuration file location can be specified with the +B<-c> switch or with the NOVABOOT_CONFIG environment variable. The +configuration file has Perl syntax (i.e. it is better to put C<1;> as +a last line) and should set values of certain Perl variables. The +current configuration can be dumped with the B<--dump-config> switch. +Some configuration variables can be overridden by environment +variables (see below) or by command line switches. Supported configuration variables include: -- 2.39.2