12c8fe9d6a
- Replace patches with upstream version
Remove: 0025-systemctl-cannot-start-fcoemon.socket.patch
Add: 0028-systemctl-cannot-start-fcoemon.socket.patch
- Pull in patches from upstream:
* Really break out of recv_loop in fipvlan (bnc#870300)
Add: 0026-FIPVLAN-Really-break-out-of-the-recv_loop-upon-fip_r.patch
* Update documentation
Add: 0025-doc-Update-QUICKSTART-INSTALL-docs-for-systemd-init-.patch
Add: 0027-man-Fix-typo-in-fcoemon-documentation.patch
- Add dependency on libhbalinux2 (bnc#873066)
- Correctly handle options when invoking fcoemon (bnc#872732)
Add: 0029-fcoemon-Correctly-handle-options-in-the-service-file.patch
- Include bnx2fc to SUPPORTED_DRIVERS (bnc#872741)
OBS-URL: https://build.opensuse.org/request/show/229743
OBS-URL: https://build.opensuse.org/package/show/network:fcoe/fcoe-utils?expand=0&rev=16
122 lines
3.5 KiB
Diff
122 lines
3.5 KiB
Diff
From 5216ae2ef4434d92ff3d49c4d5a7b73b438aee2d Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Fri, 11 Apr 2014 15:38:26 +0200
|
|
Subject: fcoemon: Correctly handle options in the service file
|
|
|
|
When runnig under systemd we can't really modify the arguments
|
|
to provide an 'FCOEMON_OPTS' variable. Instead we should be
|
|
modifying fcoemon --debug and --syslog to accept 'yes' or 'no'
|
|
as parameters; that way we can use the variables directly.
|
|
|
|
References: bnc#872732
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
doc/fcoemon.txt | 6 +++---
|
|
etc/systemd/fcoe.service | 4 ++--
|
|
fcoemon.c | 24 +++++++++++++++---------
|
|
3 files changed, 20 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/doc/fcoemon.txt b/doc/fcoemon.txt
|
|
index 7ccf892..7449601 100644
|
|
--- a/doc/fcoemon.txt
|
|
+++ b/doc/fcoemon.txt
|
|
@@ -53,13 +53,13 @@ OPTIONS
|
|
-------
|
|
*-f*, *--foreground*::
|
|
Run *fcoemon* in the foreground.
|
|
-*-d*, *--debug*::
|
|
- Enable debugging messages.
|
|
+*-d*, *--debug=yes|no*::
|
|
+ Enable or disable debugging messages.
|
|
*-l*, *--legacy*::
|
|
Force fcoemon to use the legacy /sys/module/libfcoe/parameters/
|
|
interface. The default is to use the newer /sys/bus/fcoe/ interfaces
|
|
if they are available.
|
|
-*-s*, *--syslog*::
|
|
+*-s*, *--syslog=yes|no*::
|
|
Use syslogd for logging. The default behavior is to log to stdout
|
|
and stderr.
|
|
*-h*, *--help*::
|
|
diff --git a/etc/systemd/fcoe.service b/etc/systemd/fcoe.service
|
|
index 5e5c8a2..2e10bcd 100644
|
|
--- a/etc/systemd/fcoe.service
|
|
+++ b/etc/systemd/fcoe.service
|
|
@@ -4,9 +4,9 @@ After=syslog.target network.target
|
|
|
|
[Service]
|
|
Type=simple
|
|
-EnvironmentFile=/etc/sysconfig/fcoe
|
|
+EnvironmentFile=/etc/fcoe/config
|
|
ExecStartPre=/sbin/modprobe -qa $SUPPORTED_DRIVERS
|
|
-ExecStart=/usr/sbin/fcoemon $FCOEMON_OPTS
|
|
+ExecStart=/usr/sbin/fcoemon --debug=$DEBUG --syslog=$SYSLOG
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|
|
diff --git a/fcoemon.c b/fcoemon.c
|
|
index 5e4f8d7..23fc2f6 100644
|
|
--- a/fcoemon.c
|
|
+++ b/fcoemon.c
|
|
@@ -336,9 +336,9 @@ static int fcoe_vid_from_ifname(const char *ifname);
|
|
* Table for getopt_long(3).
|
|
*/
|
|
static struct option fcm_options[] = {
|
|
- {"debug", 0, NULL, 'd'},
|
|
+ {"debug", 1, NULL, 'd'},
|
|
{"legacy", 0, NULL, 'l'},
|
|
- {"syslog", 0, NULL, 's'},
|
|
+ {"syslog", 1, NULL, 's'},
|
|
{"exec", 1, NULL, 'e'},
|
|
{"foreground", 0, NULL, 'f'},
|
|
{"version", 0, NULL, 'v'},
|
|
@@ -3192,9 +3192,9 @@ static void fcm_usage(void)
|
|
{
|
|
printf("Usage: %s\n"
|
|
"\t [-f|--foreground]\n"
|
|
- "\t [-d|--debug]\n"
|
|
+ "\t [-d|--debug=yes|no]\n"
|
|
"\t [-l|--legacy]\n"
|
|
- "\t [-s|--syslog]\n"
|
|
+ "\t [-s|--syslog=yes|no]\n"
|
|
"\t [-v|--version]\n"
|
|
"\t [-h|--help]\n\n", progname);
|
|
exit(1);
|
|
@@ -3648,22 +3648,28 @@ int main(int argc, char **argv)
|
|
sa_log_flags = 0;
|
|
openlog(sa_log_prefix, LOG_CONS, LOG_DAEMON);
|
|
|
|
- while ((c = getopt_long(argc, argv, "fdhlsv",
|
|
+ while ((c = getopt_long(argc, argv, "fd:hls:v",
|
|
fcm_options, NULL)) != -1) {
|
|
switch (c) {
|
|
case 'f':
|
|
fcm_fg = 1;
|
|
break;
|
|
case 'd':
|
|
- fcoe_config.debug = 1;
|
|
- enable_debug_log(1);
|
|
+ if (!strncmp(optarg, "yes", 3) ||
|
|
+ !strncmp(optarg, "YES", 3)) {
|
|
+ fcoe_config.debug = 1;
|
|
+ enable_debug_log(1);
|
|
+ }
|
|
break;
|
|
case 'l':
|
|
force_legacy = true;
|
|
break;
|
|
case 's':
|
|
- fcoe_config.use_syslog = 1;
|
|
- enable_syslog(1);
|
|
+ if (!strncmp(optarg, "yes", 3) ||
|
|
+ !strncmp(optarg, "YES", 3)) {
|
|
+ fcoe_config.use_syslog = 1;
|
|
+ enable_syslog(1);
|
|
+ }
|
|
break;
|
|
case 'v':
|
|
printf("%s\n", FCOE_UTILS_VERSION);
|
|
--
|
|
1.8.1.4
|
|
|