mkfs.xfs: add configuration file parsing support using libini_config
You may want to stick to specific set of configuration options when
creating filesystems with mkfs.xfs -- sometimes due to pure technical
reasons, but some other times to ensure systems remain compatible as
new features are introduced with older kernels, or if you always want
to take advantage of some new feature which would otherwise typically
be disruptive.
This adds support for parsing a configuration file to override defaults
parameters to be used for mkfs.xfs.
We define an XFS configuration directory, /etc/mkfs.xfs.d/ and allow for
different types of configuration files, if none is specified we look for
the default type, /etc/mkfs.xfs.d/default, and you can override with -T.
For instance, if you specify:
mkfs.xfs -T experimental -f /dev/loop0
The file /etc/mkfs.xfs.d/experimental will be used as your configuration
file. If you really need to override the full path of the configuration
file you may use the MKFS_XFS_CONFIG environment variable.
To use /etc/ be sure to configure xfsprogs with:
./configure --sysconfdir=/etc/
To verify what configuration file is used on a system use the typical:
mkfs.xfs -N
There is only a subset of options allowed to be set on the configuration
file, and currently only 1 or 0 are acceptable values. The default
parameters you can override on a configuration file and their current
built-in default settings are:
[data]
noalign=0
[inode]
align=1
projid32bit=1
sparse=0
[log]
lazy-count=1
[metadata]
crc=1
finobt=1
rmapbt=0
reflink=0
[naming]
ftype=1
[rtdev]
noalign=0
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
diff --git a/configure.ac b/configure.ac
index 686bf78..bb4b342 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,6 +147,10 @@
AC_PACKAGE_NEED_PTHREAD_H
AC_PACKAGE_NEED_PTHREADMUTEXINIT
+AC_PACKAGE_NEED_LIBINI_CONFIG_H
+AC_PACKAGE_NEED_INICONFIGGETSTAT
+AC_PACKAGE_SET_LIBINICONFIG
+
AC_HAVE_FADVISE
AC_HAVE_MADVISE
AC_HAVE_MINCORE
diff --git a/include/builddefs.in b/include/builddefs.in
index 7a2a626..31bae0f 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -30,6 +30,7 @@
LIBRT = @librt@
LIBUUID = @libuuid@
+LIBINICONFIG = @libiniconfig@
LIBPTHREAD = @libpthread@
LIBTERMCAP = @libtermcap@
LIBEDITLINE = @libeditline@
@@ -63,6 +64,7 @@
PKG_INC_DIR = @includedir@/xfs
DK_INC_DIR = @includedir@/disk
PKG_MAN_DIR = @mandir@
+PKG_ETC_DIR = @sysconfdir@
PKG_DOC_DIR = @datadir@/doc/@pkg_name@
PKG_LOCALE_DIR = @datadir@/locale
@@ -194,6 +196,7 @@
GCFLAGS = $(DEBUG) \
-DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \
+ -DROOT_SYSCONFDIR=\"$(PKG_ETC_DIR)\" \
-DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(TOPDIR)/libxfs
ifeq ($(ENABLE_GETTEXT),yes)
diff --git a/m4/Makefile b/m4/Makefile
index a6d11e9..ae974ed 100644
--- a/m4/Makefile
+++ b/m4/Makefile
@@ -26,6 +26,7 @@
package_unistring.m4 \
package_utilies.m4 \
package_uuiddev.m4 \
+ package_ini_config.m4 \
multilib.m4 \
$(CONFIGURE)
diff --git a/m4/package_ini_config.m4 b/m4/package_ini_config.m4
new file mode 100644
index 0000000..afc4bfe
--- /dev/null
+++ b/m4/package_ini_config.m4
@@ -0,0 +1,30 @@
+AC_DEFUN([AC_PACKAGE_NEED_LIBINI_CONFIG_H],
+ [ AC_CHECK_HEADERS([ini_configobj.h])
+ if test $ac_cv_header_ini_configobj_h = no ; then
+ AC_CHECK_HEADERS(ini_configobj.h,, [
+ echo 'FATAL ERROR: could not find a valid libini_config header.'
+ echo 'Install the libini_config development package.'
+ exit 1])
+ fi
+ ])
+
+AC_DEFUN([AC_PACKAGE_NEED_INICONFIGGETSTAT],
+ [ AC_CHECK_LIB(ini_config, ini_config_get_stat,,[
+ echo
+ echo 'FATAL ERROR: could not find a valid libini_config library.'
+ exit 1
+ ])
+ ])
+
+dnl this package seems to require an extra define, perhaps due to the
+dnl naming convention of the library
+AC_DEFUN([AC_PACKAGE_SET_LIBINICONFIG],
+[
+ if test $ac_cv_lib_ini_config_ini_config_get_stat = yes; then
+ libiniconfig='-lini_config -lbasicobjects -lref_array -lcollection'
+ else
+ echo 'FATAL ERROR: could not find ini_config_get_stat defined.'
+ exit 1
+ fi
+ AC_SUBST([libiniconfig])
+])
diff --git a/man/man5/mkfs.xfs.d.5 b/man/man5/mkfs.xfs.d.5
new file mode 100644
index 0000000..89fd28c
--- /dev/null
+++ b/man/man5/mkfs.xfs.d.5
@@ -0,0 +1,121 @@
+.TH mkfs.xfs.d 5
+.SH NAME
+mkfs.xfs.d \- mkfs.xfs configuration directory
+.SH DESCRIPTION
+.B mkfs.xfs (8)
+uses a set of initial default parameters for configuration. These defaults
+are conservatively decided by the community as xfsprogs and features for XFS
+in the kernel advance. One can override these default on the
+.B mkfs.xfs (8)
+command line, but there are cases where it is desirable for sensible defaults
+to always be specified by the system where
+.B mkfs.xfs (8)
+runs on. This may desirable for example on systems with old kernels where the
+built-in default parameters on
+.B mkfs.xfs (8)
+may not be able to create a filesystem which the old kernel supports and it
+would be unclear what parameters are needed to produce a compatible filesystem.
+Overriding
+.B mkfs.xfs (8)
+built-in defaults may also be desirable if you have a series of systems with
+different kernels and want to be able to create filesystems which all systems
+are able to support properly.
+.PP
+The XFS configuration directory
+.B mkfs.xfs.d (5)
+can be used to define different configuration file types which can be used to
+override the built-in default parameters by
+.B mkfs.xfs (8).
+Different configuration file types are supported, the default
+configuration file type,
+.I /etc/mkfs.xfs.d/default
+, will be looked for first and if present will be used to override
+.B mkfs.xfs (8)
+built-in default parameters. You can override the configuration file type by
+specifying the type when using
+.B mkfs.xfs (8)
+by using the
+.B -T
+parameter. For example:
+.I mkfs.xfs -T experimental -f /dev/sda1
+will make
+.B mkfs.xfs (8)
+look for and use the configuration file type
+.I /etc/mkfs.xfs.d/experimental
+to override
+.B mkfs.xfs (8)
+default parameters. If you need to override the full path for a configuration
+file type you can use the
+.I MKFS_XFS_CONFIG
+environment variable prior to calling
+.B mkfs.xfs (8)
+to define the
+full path to the configuration file to be used. If you used the
+.B -T
+parameter or if you set the
+.I MKFS_XFS_CONFIG
+environment variable the configuration file must be present and should parse
+correctly.
+.PP
+Parameters passed to to the
+.B mkfs.xfs (8)
+command line always override any defaults set on the configuration file used.
+.PP
+.B mkfs.xfs (8)
+will always describe what configuration file was used, if any
+was used at all. To verify which configuration file would be used prior to
+execution of
+.B mkfs.xfs (8)
+you can use
+.I mkfs.xfs -N.
+.PP
+.SH DEFAULT PARAMETERS
+Default parameters for
+.B mkfs.xfs (8)
+consists of a small subset of the parameters one can set with on the command
+line. Default parameters can only be either enabled or disabled, you can set
+their value to 1 to enable or 0 to disable. Below we list the different
+supported default parameters which can be defined on configuration files, along
+with the current built-in setting.
+.PP
+.BI [data]
+.br
+.BI noalign=0
+.PP
+.BI [inode]
+.br
+.BI align=1
+.br
+.BI projid32bit=1
+.br
+.BI sparse=0
+.PP
+.BI [log]
+.br
+.BI lazy-count=1
+.PP
+.BI [metadata]
+.br
+.BI crc=1
+.br
+.BI finobt=1
+.br
+.BI rmapbt=0
+.br
+.BI reflink=0
+.PP
+.BI [naming]
+.br
+.BI ftype=1
+.PP
+.BI [rtdev]
+.br
+.BI noalign=0
+.PP
+.SH SEE ALSO
+.BR mkfs.xfs (8),
+.BR xfsctl (3),
+.BR xfs_info (8),
+.BR xfs_admin (8),
+.BR xfsdump (8),
+.BR xfsrestore (8).
diff --git a/man/man8/mkfs.xfs.8 b/man/man8/mkfs.xfs.8
index 4b8c78c..46cfffa 100644
--- a/man/man8/mkfs.xfs.8
+++ b/man/man8/mkfs.xfs.8
@@ -83,6 +83,35 @@
.B \-l internal \-l size=10m
are equivalent.
.PP
+An optional XFS configuration directory
+.B mkfs.xfs.d (5)
+can be used to help fine tune default parameters which can be used when calling
+.B mkfs.xfs (8),
+the default configuration file,
+.I /etc/mkfs.xfs.d/default
+will always be looked for first. You can override the configuration file type
+to look for by using the
+.I -T
+parameter and secifying the type. For instance,
+.B mkfs.xfs -T experimental -f /dev/sda
+will use the configuration file
+.B /etc/mkfs.xfs.d/experimental.
+Alternatively you can set and use the
+.I MKFS_XFS_CONFIG
+environment variable to
+override the full path of the configuration file to use for
+.B mkfs.xfs (8).
+Command line arguments directly passed to
+.B mkfs.xfs (8)
+will always override parameters set on the configuration file used.
+If you use -T or set the MKFS_XFS_CONFIG environment variable the configuration
+file specified must be present. Read
+.B mkfs.xfs.d (5)
+to get an idea of the current default parameters set and the parameters you
+can override, as they are a smaller subset of the parameters you can set through
+the command line interface to
+.B mkfs.xfs (8).
+.PP
In the descriptions below, sizes are given in sectors, bytes, blocks,
kilobytes, megabytes, gigabytes, etc.
Sizes are treated as hexadecimal if prefixed by 0x or 0X,
@@ -123,6 +152,10 @@
disable or enable the functionality.
.SH OPTIONS
.TP
+.BI \-T " configuration-file-type"
+Override the default configuration file type to be used under
+.B mkfs.xfs.d (5).
+.TP
.BI \-b " block_size_options"
This option specifies the fundamental block size of the filesystem.
The valid
@@ -923,6 +956,7 @@
.SH SEE ALSO
.BR xfs (5),
.BR mkfs (8),
+.BR mkfs.xfs.d (5),
.BR mount (8),
.BR xfs_info (8),
.BR xfs_admin (8).
diff --git a/mkfs/Makefile b/mkfs/Makefile
index c84f9b6..b95ef98 100644
--- a/mkfs/Makefile
+++ b/mkfs/Makefile
@@ -11,7 +11,7 @@
CFILES = proto.c xfs_mkfs.c
LLDLIBS += $(LIBXFS) $(LIBXCMD) $(LIBFROG) $(LIBRT) $(LIBPTHREAD) $(LIBBLKID) \
- $(LIBUUID)
+ $(LIBUUID) $(LIBINICONFIG)
LTDEPENDENCIES += $(LIBXFS) $(LIBXCMD) $(LIBFROG)
LLDFLAGS = -static-libtool-libs
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 1ca6a2d..f1d1543 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -20,8 +20,13 @@
#include <ctype.h>
#include "xfs_multidisk.h"
#include "libxcmd.h"
+#include <ini_configobj.h>
-
+#define MKFS_XFS_CONF_DIR ROOT_SYSCONFDIR "/mkfs.xfs.d/"
+#define CONFIG_MAX_KEY 1024
+#define CONFIG_MAX_VALUE PATH_MAX
+#define CONFIG_MAX_BUFFER CONFIG_MAX_KEY + CONFIG_MAX_VALUE + 3
+#define PARAM_OPTS "T:b:d:i:l:L:m:n:KNp:qr:s:CfV"
#define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog)))
#define GIGABYTES(count, blog) ((uint64_t)(count) << (30 - (blog)))
@@ -840,6 +845,43 @@
};
/*
+ * File configuration type settings
+ *
+ * These are the different possibilities by which you can end up parsing
+ * default settings with. DEFAULTS_BUILTIN indicates there was no configuration
+ * file parsed and we are using the built-in defaults on this code.
+ * DEFAULTS_CONFIG means the default configuration file was found and used.
+ * DEFAULTS_TYPE_CONFIG means the user asked for a custom configuration type
+ * and it was used, this means the default directory for mkfs.xfs
+ * configuration files was used to look for the type specified. If you need
+ * to override the default mkfs.xfs directory for configuration file you can
+ * use the MKFS_XFS_CONFIG environment variable to set the absolute path to
+ * your custom configuration file, when this is set the type is set to
+ * DEFAULTS_ENVIRONMENT_CONFIG.
+ */
+enum default_params_type {
+ DEFAULTS_BUILTIN = 0,
+ DEFAULTS_CONFIG,
+ DEFAULTS_ENVIRONMENT_CONFIG,
+ DEFAULTS_TYPE_CONFIG,
+};
+
+static const char *default_type_str(enum default_params_type type)
+{
+ switch (type) {
+ case DEFAULTS_BUILTIN:
+ return _("package build definitions");
+ case DEFAULTS_CONFIG:
+ return _("default configuration system file");
+ case DEFAULTS_ENVIRONMENT_CONFIG:
+ return _("custom configuration file set by environment");
+ case DEFAULTS_TYPE_CONFIG:
+ return _("custom configuration type file");
+ }
+ return _("Unkown\n");
+}
+
+/*
* Default filesystem features and configuration values
*
* This structure contains the default mkfs values that are to be used when
@@ -848,7 +890,8 @@
* calculations.
*/
struct mkfs_default_params {
- char *source; /* where the defaults came from */
+ enum default_params_type type; /* where the defaults came from */
+ const char *config_file;
int sectorsize;
int blocksize;
@@ -1414,6 +1457,12 @@
return 0;
}
+static int block_config_parser(struct mkfs_default_params *dft, int subopt,
+ bool value)
+{
+ return -EINVAL;
+}
+
static int
data_opts_parser(
struct opt_params *opts,
@@ -1477,6 +1526,19 @@
return 0;
}
+static int data_config_parser(struct mkfs_default_params *dft, int subopt,
+ bool value)
+{
+ switch (subopt) {
+ case D_NOALIGN:
+ dft->sb_feat.nodalign = value;
+ break;
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
static int
inode_opts_parser(
struct opt_params *opts,
@@ -1512,6 +1574,25 @@
return 0;
}
+static int inode_config_parser(struct mkfs_default_params *dft, int subopt,
+ bool value)
+{
+ switch (subopt) {
+ case I_ALIGN:
+ dft->sb_feat.inode_align = value;
+ break;
+ case I_PROJID32BIT:
+ dft->sb_feat.projid32bit = value;
+ break;
+ case I_SPINODES:
+ dft->sb_feat.spinodes = value;
+ break;
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
static int
log_opts_parser(
struct opt_params *opts,
@@ -1558,6 +1639,19 @@
return 0;
}
+static int log_config_parser(struct mkfs_default_params *dft, int subopt,
+ bool value)
+{
+ switch (subopt) {
+ case L_LAZYSBCNTR:
+ dft->sb_feat.lazy_sb_counters = value;
+ break;
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
static int
meta_opts_parser(
struct opt_params *opts,
@@ -1592,6 +1686,30 @@
return 0;
}
+static int meta_config_parser(struct mkfs_default_params *dft, int subopt,
+ bool value)
+{
+ switch (subopt) {
+ case M_CRC:
+ dft->sb_feat.crcs_enabled = value;
+ if (dft->sb_feat.crcs_enabled)
+ dft->sb_feat.dirftype = true;
+ break;
+ case M_FINOBT:
+ dft->sb_feat.finobt = value;
+ break;
+ case M_RMAPBT:
+ dft->sb_feat.rmapbt = value;
+ break;
+ case M_REFLINK:
+ dft->sb_feat.reflink = value;
+ break;
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
static int
naming_opts_parser(
struct opt_params *opts,
@@ -1621,6 +1739,19 @@
return 0;
}
+static int naming_config_parser(struct mkfs_default_params *dft, int subopt,
+ bool value)
+{
+ switch (subopt) {
+ case N_FTYPE:
+ dft->sb_feat.dirftype = value;
+ break;
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
static int
rtdev_opts_parser(
struct opt_params *opts,
@@ -1651,6 +1782,19 @@
return 0;
}
+static int rtdev_config_parser(struct mkfs_default_params *dft, int subopt,
+ bool value)
+{
+ switch (subopt) {
+ case R_NOALIGN:
+ dft->sb_feat.nortalign = value;
+ break;
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
static int
sector_opts_parser(
struct opt_params *opts,
@@ -1670,19 +1814,27 @@
return 0;
}
+static int sector_config_parser(struct mkfs_default_params *dft, int subopt,
+ bool value)
+{
+ return -EINVAL;
+}
+
struct subopts {
char opt;
struct opt_params *opts;
int (*parser)();
+ int (*config_parser)(struct mkfs_default_params *dft,
+ int subop, bool value);
} subopt_tab[] = {
- { 'b', &bopts, block_opts_parser },
- { 'd', &dopts, data_opts_parser },
- { 'i', &iopts, inode_opts_parser },
- { 'l', &lopts, log_opts_parser },
- { 'm', &mopts, meta_opts_parser },
- { 'n', &nopts, naming_opts_parser },
- { 'r', &ropts, rtdev_opts_parser },
- { 's', &sopts, sector_opts_parser },
+ { 'b', &bopts, block_opts_parser, block_config_parser },
+ { 'd', &dopts, data_opts_parser, data_config_parser },
+ { 'i', &iopts, inode_opts_parser, inode_config_parser },
+ { 'l', &lopts, log_opts_parser, log_config_parser },
+ { 'm', &mopts, meta_opts_parser, meta_config_parser },
+ { 'n', &nopts, naming_opts_parser, naming_config_parser },
+ { 'r', &ropts, rtdev_opts_parser, rtdev_config_parser },
+ { 's', &sopts, sector_opts_parser, sector_config_parser },
{ '\0', NULL, NULL },
};
@@ -1720,6 +1872,200 @@
}
}
+static int
+parse_config_subopts(
+ char opt,
+ bool value,
+ char *line,
+ struct mkfs_default_params *dft)
+{
+ struct subopts *sop = &subopt_tab[0];
+ char **subopts = (char **)sop->opts->subopts;
+ int subopt;
+ char *val;
+
+ while (sop->opts) {
+ if (sop->opt == opt)
+ break;
+ sop++;
+ }
+
+ /* should never happen */
+ if (!sop->opts)
+ return -EINVAL;
+
+ subopts = (char **)sop->opts->subopts;
+ subopt = getsubopt(&line, subopts, &val);
+ return (sop->config_parser)(dft, subopt, value);
+}
+
+static int get_subopt_type(const char *buffer)
+{
+ if (strncmp("block", buffer, 5) == 0)
+ return 'b';
+ if (strncmp("data", buffer, 4) == 0)
+ return 'd';
+ if (strncmp("inode", buffer, 5) == 0)
+ return 'i';
+ if (strncmp("log", buffer, 3) == 0)
+ return 'l';
+ if (strncmp("metadata", buffer, 8) == 0)
+ return 'm';
+ if (strncmp("naming", buffer, 6) == 0)
+ return 'n';
+ if (strncmp("rtdev", buffer, 5) == 0)
+ return 'r';
+ if (strncmp("sector", buffer, 6) == 0)
+ return 'n';
+ return 0;
+}
+
+static int mkfs_check_config_file_limits(const char *filename,
+ const struct stat *sb,
+ unsigned int max_entries)
+{
+ unsigned long long size_limit;
+
+ size_limit = CONFIG_MAX_BUFFER * max_entries;
+
+ /*
+ * Detect wrap around -- if max_entries * size_limit goves over
+ * unsigned long long we detect that there. Also libiniconfig only
+ * groks max INT_MAX entries anyway.
+ */
+ if (size_limit < max_entries || max_entries > INT_MAX)
+ return -E2BIG;
+
+ if (sb->st_size > size_limit) {
+ fprintf(stderr,
+ "File %s is too big! File size limit: %llu\n",
+ filename, size_limit);
+ return -E2BIG;
+ }
+
+ return 0;
+}
+
+static int parse_config_init(struct mkfs_default_params *dft)
+{
+ int ret;
+ struct ini_cfgobj *ini_config = NULL;
+ struct ini_cfgfile *ctx = NULL;
+ const struct stat *sp = NULL;
+ unsigned int num_subopts_sections = sizeof(subopt_tab) /
+ sizeof(struct subopts) - 1;
+ char **sections, **attrs;
+ char *section, *attr;
+ int i, x, size, num_attr;
+ int type = 0;
+
+ ret = ini_config_create(&ini_config);
+ if (ret)
+ return ret;
+
+ ret = ini_config_file_open(dft->config_file, INI_META_STATS, &ctx);
+ if (ret) {
+ if (dft->type != DEFAULTS_BUILTIN)
+ fprintf(stderr, _("ini_config_file_open(): could not open config file: %s: %s\n"),
+ dft->config_file, strerror(ret));
+ else
+ ret = 0;
+ goto out;
+ }
+
+ /* If we found a file magically, it would be the default file */
+ if (dft->type == DEFAULTS_BUILTIN)
+ dft->type = DEFAULTS_CONFIG;
+
+ sp = ini_config_get_stat(ctx);
+ if (!sp) {
+ ret = -EACCES;
+ fprintf(stderr, _("ini_config_get_stat(): could get stat on file: %s: %s\n"),
+ dft->config_file, strerror(ret));
+ goto out;
+ }
+
+ if (!sp->st_size)
+ return 0;
+
+ ret = mkfs_check_config_file_limits(dft->config_file, sp,
+ num_subopts_sections);
+ if (ret)
+ goto out;
+
+ /* Stop on any errors detected */
+ ret = ini_config_parse(ctx,
+ INI_STOP_ON_ANY,
+ 0,
+ 0,
+ ini_config);
+ if (ret)
+ goto out;
+
+ sections = ini_get_section_list(ini_config, &size, &ret);
+ if (ret || sections == NULL)
+ goto out;
+
+ for (i=0; i < size; i++) {
+ if (!sections[i]) {
+ ret = -EINVAL;
+ goto out_free_sections;
+ }
+ section = sections[i];
+ type = get_subopt_type(section);
+ if (!type) {
+ ret = -EINVAL;
+ goto out_free_sections;
+ }
+ attrs = ini_get_attribute_list(ini_config, section,
+ &num_attr, &ret);
+ if (ret || attrs == NULL) {
+ if (ret == 0 && !attrs)
+ ret = -EINVAL;
+ goto out_free_sections;
+ }
+
+ for (x=0; x < num_attr; x++) {
+ uint64_t val;
+ struct value_obj *vo;
+ char line[160];
+ bool value;
+
+ memset(line, 0, sizeof(line));
+ attr = attrs[x];
+ ret = ini_get_config_valueobj(section, attr, ini_config,
+ INI_GET_FIRST_VALUE, &vo);
+ if (ret || !vo) {
+ if (ret == 0 && !vo)
+ ret = -EINVAL;
+ goto out_free_sections;
+ }
+
+ val = ini_get_unsigned_config_value(vo, 1, 0, &ret);
+ if (ret)
+ goto out_free_sections;
+
+ value = !!val;
+
+ snprintf(line, sizeof(line), "%s=%lu", attr, val);
+ ret = parse_config_subopts(type, value, line, dft);
+ if (ret) {
+ fprintf(stderr, _("Invalid line in config file: %s\n"),
+ line);
+ goto out_free_sections;
+ }
+ }
+ ini_free_attribute_list(attrs);
+ }
+
+out_free_sections:
+ ini_free_section_list(sections);
+out:
+ ini_config_destroy(ini_config);
+ return ret;
+}
+
+
static void
validate_sectorsize(
struct mkfs_params *cfg,
@@ -3177,11 +3523,13 @@
struct mkfs_params *cfg,
char *dfile,
char *logfile,
- char *rtfile)
+ char *rtfile,
+ struct mkfs_default_params *dft)
{
struct sb_feat_args *fp = &cfg->sb_feat;
printf(_(
+"config-file=%-22s\n"
"meta-data=%-22s isize=%-6d agcount=%lld, agsize=%lld blks\n"
" =%-22s sectsz=%-5u attr=%u, projid32bit=%u\n"
" =%-22s crc=%-8u finobt=%u, sparse=%u, rmapbt=%u, reflink=%u\n"
@@ -3191,6 +3539,7 @@
"log =%-22s bsize=%-6d blocks=%lld, version=%d\n"
" =%-22s sectsz=%-5u sunit=%d blks, lazy-count=%d\n"
"realtime =%-22s extsz=%-6d blocks=%lld, rtextents=%lld\n"),
+ dft->type != DEFAULTS_BUILTIN ? dft->config_file : "empty",
dfile, cfg->inodesize, (long long)cfg->agcount,
(long long)cfg->agsize,
"", cfg->sectorsize, fp->attr_version, fp->projid32bit,
@@ -3797,7 +4146,8 @@
/* build time defaults */
struct mkfs_default_params dft = {
- .source = _("package build definitions"),
+ .type = DEFAULTS_BUILTIN,
+ .config_file = MKFS_XFS_CONF_DIR "default",
.sectorsize = XFS_MIN_SECTORSIZE,
.blocksize = 1 << XFS_DFL_BLOCKSIZE_LOG,
.sb_feat = {
@@ -3819,6 +4169,9 @@
.nortalign = false,
},
};
+ char *tmp_config;
+ char custom_config[PATH_MAX];
+ int ret;
platform_uuid_generate(&cli.uuid);
progname = basename(argv[0]);
@@ -3827,25 +4180,47 @@
textdomain(PACKAGE);
/*
- * TODO: Sourcing defaults from a config file
- *
* Before anything else, see if there's a config file with different
- * defaults. If a file exists in <package location>, read in the new
+ * defaults. If a file exists in MKFS_XFS_CONF_DIR/default, read the new
* default values and overwrite them in the &dft structure. This way the
* new defaults will apply before we parse the CLI, and the CLI will
* still be able to override them. When more than one source is
* implemented, emit a message to indicate where the defaults being
* used came from.
- *
- * printf(_("Default configuration sourced from %s\n"), dft.source);
*/
+ tmp_config = getenv("MKFS_XFS_CONFIG");
+ if (tmp_config != NULL) {
+ dft.config_file = tmp_config;
+ dft.type = DEFAULTS_ENVIRONMENT_CONFIG;
+ }
+
+ c = getopt(argc, argv, PARAM_OPTS);
+ if (c != EOF && c == 't') {
+ memset(custom_config, 0, sizeof(custom_config));
+ snprintf(custom_config, sizeof(custom_config), "%s%s",
+ MKFS_XFS_CONF_DIR, optarg);
+ dft.config_file = custom_config;
+ dft.type = DEFAULTS_TYPE_CONFIG;
+ }
+
+ ret = parse_config_init(&dft);
+
+ printf(_("Default configuration sourced from %s\n"),
+ default_type_str(dft.type));
+
+ if (ret && dft.type != DEFAULTS_BUILTIN)
+ usage();
/* copy new defaults into CLI parsing structure */
memcpy(&cli.sb_feat, &dft.sb_feat, sizeof(cli.sb_feat));
memcpy(&cli.fsx, &dft.fsx, sizeof(cli.fsx));
- while ((c = getopt(argc, argv, "b:d:i:l:L:m:n:KNp:qr:s:CfV")) != EOF) {
+ while (true) {
+ if (c == EOF)
+ break;
switch (c) {
+ case 'T':
+ break;
case 'C':
case 'f':
force_overwrite = 1;
@@ -3885,6 +4260,7 @@
case '?':
unknown(optopt, "");
}
+ c = getopt(argc, argv, PARAM_OPTS);
}
if (argc - optind > 1) {
fprintf(stderr, _("extra arguments\n"));
@@ -3968,7 +4344,7 @@
calculate_log_size(&cfg, &cli, mp);
if (!quiet || dry_run) {
- print_mkfs_cfg(&cfg, dfile, logfile, rtfile);
+ print_mkfs_cfg(&cfg, dfile, logfile, rtfile, &dft);
if (dry_run)
exit(0);
}
