|
 |
6bbb925 |
From b1799fe84ed94a19bba6bcd7284ce8b038be4ffe Mon Sep 17 00:00:00 2001
|
|
|
6bbb925 |
From: Chris Leech <cleech@redhat.com>
|
|
|
6bbb925 |
Date: Mon, 10 Dec 2012 13:20:47 -0800
|
|
|
6bbb925 |
Subject: iscsid: add --initrd option to set run from initrd hint for systemd
|
|
|
6bbb925 |
|
|
|
6bbb925 |
See http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons
|
|
|
6bbb925 |
|
|
|
6bbb925 |
Signed-off-by: Chris Leech <cleech@redhat.com>
|
|
|
6bbb925 |
---
|
|
|
6bbb925 |
usr/iscsid.c | 8 ++++++++
|
|
|
6bbb925 |
1 file changed, 8 insertions(+)
|
|
|
6bbb925 |
|
|
|
6bbb925 |
diff --git a/usr/iscsid.c b/usr/iscsid.c
|
|
|
6bbb925 |
index b4bb65b..7d71085 100644
|
|
|
6bbb925 |
--- a/usr/iscsid.c
|
|
|
6bbb925 |
+++ b/usr/iscsid.c
|
|
|
6bbb925 |
@@ -61,6 +61,7 @@ static pid_t log_pid;
|
|
|
6bbb925 |
static gid_t gid;
|
|
|
6bbb925 |
static int daemonize = 1;
|
|
|
6bbb925 |
static int mgmt_ipc_fd;
|
|
|
6bbb925 |
+static int initrd = 0;
|
|
|
6bbb925 |
|
|
|
6bbb925 |
static struct option const long_options[] = {
|
|
|
6bbb925 |
{"config", required_argument, NULL, 'c'},
|
|
|
6bbb925 |
@@ -73,6 +74,7 @@ static struct option const long_options[] = {
|
|
|
6bbb925 |
{"pid", required_argument, NULL, 'p'},
|
|
|
6bbb925 |
{"help", no_argument, NULL, 'h'},
|
|
|
6bbb925 |
{"version", no_argument, NULL, 'v'},
|
|
|
6bbb925 |
+ {"initrd", no_argument, &initrd, 1},
|
|
|
6bbb925 |
{NULL, 0, NULL, 0},
|
|
|
6bbb925 |
};
|
|
|
6bbb925 |
|
|
|
6bbb925 |
@@ -95,6 +97,7 @@ Open-iSCSI initiator daemon.\n\
|
|
|
6bbb925 |
-p, --pid=pidfile use pid file (default " PID_FILE ").\n\
|
|
|
6bbb925 |
-h, --help display this help and exit\n\
|
|
|
6bbb925 |
-v, --version display version and exit\n\
|
|
|
6bbb925 |
+ --initrd run from initrd\n\
|
|
|
6bbb925 |
");
|
|
|
6bbb925 |
}
|
|
|
6bbb925 |
exit(status);
|
|
|
6bbb925 |
@@ -383,12 +386,17 @@ int main(int argc, char *argv[])
|
|
|
6bbb925 |
case 'h':
|
|
|
6bbb925 |
usage(0);
|
|
|
6bbb925 |
break;
|
|
|
6bbb925 |
+ case 0:
|
|
|
6bbb925 |
+ break;
|
|
|
6bbb925 |
default:
|
|
|
6bbb925 |
usage(1);
|
|
|
6bbb925 |
break;
|
|
|
6bbb925 |
}
|
|
|
6bbb925 |
}
|
|
|
6bbb925 |
|
|
|
6bbb925 |
+ if (initrd)
|
|
|
6bbb925 |
+ argv[0][0] = '@';
|
|
|
6bbb925 |
+
|
|
|
6bbb925 |
/* initialize logger */
|
|
|
6bbb925 |
log_pid = log_init(program_name, DEFAULT_AREA_SIZE,
|
|
|
6bbb925 |
daemonize ? log_do_log_daemon : log_do_log_std, NULL);
|
|
|
6bbb925 |
--
|
|
|
6bbb925 |
1.7.11.7
|
|
|
6bbb925 |
|