diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | ReadMe.c | 2 | ||||
| -rw-r--r-- | mdadm.8.in | 16 | ||||
| -rw-r--r-- | mdadm.conf.5 | 2 | ||||
| -rw-r--r-- | mdassemble.8 | 2 | ||||
| -rw-r--r-- | sha1.h | 8 | ||||
| -rw-r--r-- | systemd/mdmonitor.service | 5 | ||||
| -rw-r--r-- | udev-md-raid-arrays.rules | 8 | ||||
| -rw-r--r-- | udev-md-raid-assembly.rules | 2 |
9 files changed, 23 insertions, 28 deletions
@@ -43,7 +43,7 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIB CC = $(CROSS_COMPILE)gcc CXFLAGS ?= -ggdb -CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter +CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter ifdef WARN_UNUSED CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3 endif @@ -62,8 +62,8 @@ CPPFLAGS += -DBINDIR=\"$(BINDIR)\" PKG_CONFIG ?= pkg-config SYSCONFDIR = /etc -CONFFILE = $(SYSCONFDIR)/mdadm.conf -CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf +CONFFILE = $(SYSCONFDIR)/mdadm/mdadm.conf +CONFFILE2 = $(SYSCONFDIR)/mdadm.conf MAILCMD =/usr/sbin/sendmail -t CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\" # Both MAP_DIR and MDMON_DIR should be somewhere that persists across the @@ -593,7 +593,7 @@ char Help_incr[] = ; char Help_config[] = -"The /etc/mdadm.conf config file:\n\n" +"The /etc/mdadm/mdadm.conf config file:\n\n" " The config file contains, apart from blank lines and comment lines that\n" " start with a hash(#), array lines, device lines, and various\n" " configuration lines.\n" @@ -267,13 +267,13 @@ the exact meaning of this option in different contexts. .TP .BR \-c ", " \-\-config= Specify the config file or directory. Default is to use -.B /etc/mdadm.conf +.B /etc/mdadm/mdadm.conf and -.BR /etc/mdadm.conf.d , +.BR /etc/mdadm/mdadm.conf.d , or if those are missing then -.B /etc/mdadm/mdadm.conf +.B /etc/mdadm.conf and -.BR /etc/mdadm/mdadm.conf.d . +.BR /etc/mdadm.conf.d . If the config file given is .B "partitions" then nothing will be read, but @@ -1803,9 +1803,9 @@ The config file is only used if explicitly named with or requested with (a possibly implicit) .BR \-\-scan . In the later case, -.B /etc/mdadm.conf -or .B /etc/mdadm/mdadm.conf +or +.B /etc/mdadm.conf is used. If @@ -3099,7 +3099,7 @@ uses this to find arrays when is given in Misc mode, and to monitor array reconstruction on Monitor mode. -.SS /etc/mdadm.conf +.SS /etc/mdadm/mdadm.conf (or /etc/mdadm.conf) The config file lists which devices may be scanned to see if they contain MD super block, and gives identifying information @@ -3107,7 +3107,7 @@ they contain MD super block, and gives identifying information .BR mdadm.conf (5) for more details. -.SS /etc/mdadm.conf.d +.SS /etc/mdadm/mdadm.conf.d (or /etc/mdadm.conf.d) A directory containing configuration files which are read in lexical order. diff --git a/mdadm.conf.5 b/mdadm.conf.5 index 18512cb0..542e2635 100644 --- a/mdadm.conf.5 +++ b/mdadm.conf.5 @@ -8,7 +8,7 @@ .SH NAME mdadm.conf \- configuration for management of Software RAID with mdadm .SH SYNOPSIS -/etc/mdadm.conf +/etc/mdadm/mdadm.conf .SH DESCRIPTION .PP .I mdadm diff --git a/mdassemble.8 b/mdassemble.8 index 7601b1aa..601c1d10 100644 --- a/mdassemble.8 +++ b/mdassemble.8 @@ -40,7 +40,7 @@ There are no options to .SH FILES -.SS /etc/mdadm.conf +.SS /etc/mdadm/mdadm.conf The config file lists which devices may be scanned to see if they contain MD super block, and gives identifying information @@ -22,7 +22,7 @@ #include <stdio.h> -#if defined HAVE_LIMITS_H || _LIBC +#if 1 /* defined HAVE_LIMITS_H || _LIBC */ # include <limits.h> #endif @@ -33,9 +33,9 @@ the resulting executable. Locally running cross-compiled executables is usually not possible. */ -#ifdef _LIBC -# include <sys/types.h> -typedef u_int32_t sha1_uint32; +#if 1 /* def _LIBC */ +# include <stdint.h> +typedef uint32_t sha1_uint32; typedef uintptr_t sha1_uintptr; #else # define INT_MAX_32_BITS 2147483647 diff --git a/systemd/mdmonitor.service b/systemd/mdmonitor.service index c7cff3e4..9aff2f56 100644 --- a/systemd/mdmonitor.service +++ b/systemd/mdmonitor.service @@ -10,7 +10,4 @@ Description=MD array monitor DefaultDependencies=no [Service] -Environment= MDADM_MONITOR_ARGS=--scan -EnvironmentFile=-/run/sysconfig/mdadm -ExecStartPre=-/usr/lib/systemd/scripts/mdadm_env.sh -ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS +ExecStart=BINDIR/mdadm --monitor --scan diff --git a/udev-md-raid-arrays.rules b/udev-md-raid-arrays.rules index c95ec7b1..a32b6d2d 100644 --- a/udev-md-raid-arrays.rules +++ b/udev-md-raid-arrays.rules @@ -17,7 +17,7 @@ TEST!="md/array_state", ENV{SYSTEMD_READY}="0", GOTO="md_end" ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end" LABEL="md_ignore_state" -IMPORT{program}="BINDIR/mdadm --detail --export $devnode" +IMPORT{program}="BINDIR/mdadm --detail --export $tempnode" ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace" ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}" ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}" @@ -26,16 +26,14 @@ ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n" ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n" -IMPORT{builtin}="blkid" -OPTIONS+="link_priority=100" -OPTIONS+="watch" +IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode" ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service" # Tell systemd to run mdmon for our container, if we need it. -ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c" +ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c" ENV{MD_MON_THIS}=="?*", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service" LABEL="md_end" diff --git a/udev-md-raid-assembly.rules b/udev-md-raid-assembly.rules index d0d440a6..4d27d630 100644 --- a/udev-md-raid-assembly.rules +++ b/udev-md-raid-assembly.rules @@ -27,7 +27,7 @@ LABEL="md_inc" # remember you can limit what gets auto/incrementally assembled by # mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY' -ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $devnode --offroot ${DEVLINKS}" +ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $tempnode --offroot ${DEVLINKS}" ACTION=="add|change", ENV{MD_STARTED}=="*unsafe*", ENV{MD_FOREIGN}=="no", ENV{SYSTEMD_WANTS}+="mdadm-last-resort@$env{MD_DEVICE}.timer" ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="BINDIR/mdadm -If $name --path $env{ID_PATH}" ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="BINDIR/mdadm -If $name" |