Change the "env_check_mdmon" function to be more generic, accepting
and environment variable name, as soon we will have a new use for it.
Signed-off-by: NeilBrown <neilb@suse.de>
extern int mdmon_running(int devnum);
extern int signal_mdmon(int devnum);
extern int mdmon_running(int devnum);
extern int signal_mdmon(int devnum);
-extern int env_no_mdmon(void);
+extern int check_env(char *name);
extern int start_mdmon(int devnum);
extern char *devnum2devname(int num);
extern int start_mdmon(int devnum);
extern char *devnum2devname(int num);
static int do_fork(void)
{
#ifdef DEBUG
static int do_fork(void)
{
#ifdef DEBUG
+ if (check_env("MDADM_NO_MDMON"))
enum imsm_update_type type;
};
enum imsm_update_type type;
};
-static int imsm_env_devname_as_serial(void)
-{
- char *val = getenv("IMSM_DEVNAME_AS_SERIAL");
-
- if (val && atoi(val) == 1)
- return 1;
-
- return 0;
-}
-
-
static struct supertype *match_metadata_desc_imsm(char *arg)
{
struct supertype *st;
static struct supertype *match_metadata_desc_imsm(char *arg)
{
struct supertype *st;
rv = scsi_get_serial(fd, scsi_serial, sizeof(scsi_serial));
rv = scsi_get_serial(fd, scsi_serial, sizeof(scsi_serial));
- if (rv && imsm_env_devname_as_serial()) {
+ if (rv && check_env("IMSM_DEVNAME_AS_SERIAL")) {
memset(serial, 0, MAX_RAID_SERIAL_LEN);
fd2devname(fd, (char *) serial);
return 0;
memset(serial, 0, MAX_RAID_SERIAL_LEN);
fd2devname(fd, (char *) serial);
return 0;
+ if (check_env("MDADM_NO_MDMON"))
return 0;
len = readlink("/proc/self/exe", pathbuf, sizeof(pathbuf));
return 0;
len = readlink("/proc/self/exe", pathbuf, sizeof(pathbuf));
+int check_env(char *name)
- char *val = getenv("MDADM_NO_MDMON");
+ char *val = getenv(name);
if (val && atoi(val) == 1)
return 1;
if (val && atoi(val) == 1)
return 1;