retronetworking
/
isdn4k-utils
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

isdn4k-utils: Load capifs silently 

capifs is obsolete and scheduled for removal from the kernel. So stop
screaming if it is not there, udev with proper rules will take care.

At this chance, there is no need to retry loading it. If it failed once,
it will do so again.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
Acked-By: Jan-Michael Brummer
Signed-off-by: Karsten Keil <kkeil@linux-pingi.de>
This commit is contained in:
Karsten Keil 2012-02-25 17:03:13 +01:00
parent 96f9fc02d1
commit c7488d9bcf
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
capiinit/capiinit.c
View File

@ -161,10 +161,11 @@ static int is_module_loaded(char *module)
return 0;
}
static int load_module(char *module)
static int load_module(char *module, int silently)
{
char buf[1024];
snprintf(buf, sizeof(buf), "%s %s", MODPROBE, module);
snprintf(buf, sizeof(buf), "%s %s %s", MODPROBE, module,
silently ? "2>/dev/null" : "");
return system(buf);
}
@ -368,7 +369,7 @@ static int load_driver(char *driver)
driver = "b1pci";
if (strcmp(driver, "c2") == 0)
driver = "c4";
return load_module(driver);
return load_module(driver, 0);
}
static int unload_driver(char *driver)
@ -410,7 +411,7 @@ static int filesystem_available(char *fstype)
static int load_filesystem(char *fstype)
{
return load_module(fstype);
return load_module(fstype, 1);
}
static int unload_filesystem(char *fstype)
@ -1154,7 +1155,7 @@ static int check_for_kernelcapi(void)
{
if (access("/proc/capi/applications", 0) == 0)
return 0;
load_module("kernelcapi");
load_module("kernelcapi", 0);
if (access("/proc/capi/applications", 0) == 0)
return 0;
fprintf(stderr, "ERROR: cannot load module kernelcapi\n");
@ -1165,7 +1166,7 @@ static int check_for_capi(void)
{
if (access("/proc/capi/capi20", 0) == 0)
return 0;
load_module("capi");
load_module("capi", 0);
if (access("/proc/capi/capi20", 0) == 0)
return 0;
fprintf(stderr, "ERROR: cannot load module capi20\n");
@ -1200,10 +1201,6 @@ static int check_for_capifs(void)
if (filesystem_available("devfs"))
return 0;
#endif
load_filesystem("capifs");
if (filesystem_available("capifs"))
return 0;
fprintf(stderr, "WARNING: filesystem capifs not available\n");
return -1;
}