diff options
| author | trasz <trasz@FreeBSD.org> | 2013-09-18 08:37:14 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2013-09-18 08:37:14 +0000 |
| commit | 2320759748604480072b729069f5e3012914398b (patch) | |
| tree | 5e1b95f26baf4ffed69f3b0909ea4f49779ac355 /usr.sbin | |
| parent | aa6935c0786ab4f36492f049786d15ed8ba0a183 (diff) | |
| download | FreeBSD-src-2320759748604480072b729069f5e3012914398b.zip FreeBSD-src-2320759748604480072b729069f5e3012914398b.tar.gz | |
Make iscsictl(8) automatically try to load the iscsi module. While here,
improve module loading in iscsid(8) and ctld(8).
Approved by: re (delphij)
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/ctld/kernel.c | 2 | ||||
| -rw-r--r-- | usr.sbin/iscsid/iscsid.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c index 50ddc0c..869d0a0 100644 --- a/usr.sbin/ctld/kernel.c +++ b/usr.sbin/ctld/kernel.c @@ -79,7 +79,7 @@ kernel_init(void) int retval, saved_errno; ctl_fd = open(CTL_DEFAULT_DEV, O_RDWR); - if (ctl_fd < 0) { + if (ctl_fd < 0 && errno == ENOENT) { saved_errno = errno; retval = kldload("ctl"); if (retval != -1) diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c index 56733c1..0547465 100644 --- a/usr.sbin/iscsid/iscsid.c +++ b/usr.sbin/iscsid/iscsid.c @@ -509,7 +509,7 @@ main(int argc, char **argv) } iscsi_fd = open(ISCSI_PATH, O_RDWR); - if (iscsi_fd < 0) { + if (iscsi_fd < 0 && errno == ENOENT) { saved_errno = errno; retval = kldload("iscsi"); if (retval != -1) |
