Switch from /lib/init/rw to /dev for early-boot files.

It turns out that /lib/init/rw doesn't exist in early boot
like I thought.  So give up on that idea and just use
/dev/.mdadm/ for files that must persist from early-boot
to regular boot.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2010-07-28 17:04:42 +10:00
parent 08415c46a8
commit 7f5de63d51
3 changed files with 8 additions and 8 deletions

View File

@ -66,11 +66,11 @@ MAILCMD =/usr/sbin/sendmail -t
CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\"
# Both MAP_DIR and MDMON_DIR should be somewhere that persists across the
# pivotroot from early boot to late boot.
# If you don't have /lib/init/rw you might want to use /dev/.something
# e.g. make MAP_DIR=/dev/.mdadm
MAP_DIR = /lib/init/rw/mdadm
# /dev is an odd place to put this, but it is the only directory that
# meets the requirements.
MAP_DIR=/dev/.mdadm
MAP_FILE = map
MDMON_DIR = /lib/init/rw/mdmon
MDMON_DIR = /dev/.mdadm
DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\"
DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\"
CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS)

View File

@ -70,10 +70,10 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
/* MAP_DIR should be somewhere that persists across the pivotroot
* from early boot to late boot.
* If you don't have /lib/init/rw you might want to use /dev/.something
* Currently /dev seems to be the only option on most distros.
*/
#ifndef MAP_DIR
#define MAP_DIR "/lib/init/rw/mdadm"
#define MAP_DIR "/dev/.mdadm"
#endif /* MAP_DIR */
/* MAP_FILE is what we name the map file we put in MAP_DIR, in case you
* want something other than the default of "map"
@ -90,7 +90,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
* boot process and stays up as long as possible during shutdown.
*/
#ifndef MDMON_DIR
#define MDMON_DIR "/lib/init/rw/mdmon"
#define MDMON_DIR "/dev/.mdadm/"
#endif /* MDMON_DIR */
#include "md_u.h"

View File

@ -208,7 +208,7 @@ and
.B .sock
file on. The particular filesystem to use is given to mdmon at compile
time and defaults to
.BR /lib/init/rw .
.BR /dev/.mdadm .
This filesystem must persist through to the end of the boot sequence.