From 4fb9e3f03506695023d6aac0106b7f541b820c80 Mon Sep 17 00:00:00 2001 From: Kozlov Dmitry Date: Wed, 16 May 2012 00:02:43 +0400 Subject: write message to log if unable to load necessary kernel module --- accel-pppd/ctrl/l2tp/l2tp.c | 3 ++- accel-pppd/ctrl/pppoe/pppoe.c | 3 ++- accel-pppd/ctrl/pptp/pptp.c | 3 ++- accel-pppd/shaper/limiter.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c index 65cf456c..1ec2daaa 100644 --- a/accel-pppd/ctrl/l2tp/l2tp.c +++ b/accel-pppd/ctrl/l2tp/l2tp.c @@ -1165,7 +1165,8 @@ static void load_config(void) static void l2tp_init(void) { - system("modprobe pppol2tp &> /dev/null || modprobe l2tp_ppp &> /dev/null"); + if (system("modprobe -q pppol2tp || modprobe -q l2tp_ppp")) + log_warn("unable to load l2tp kernel module\n"); l2tp_conn = malloc(L2TP_MAX_TID * sizeof(void *)); memset(l2tp_conn, 0, L2TP_MAX_TID * sizeof(void *)); diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c index 43dc6437..41a0924d 100644 --- a/accel-pppd/ctrl/pppoe/pppoe.c +++ b/accel-pppd/ctrl/pppoe/pppoe.c @@ -1429,7 +1429,8 @@ static void pppoe_init(void) struct conf_sect_t *s = conf_get_section("pppoe"); struct conf_option_t *opt; - system("modprobe pppoe"); + if (system("modprobe -q pppoe")) + log_warn("failed to load pppoe kernel module\n"); conn_pool = mempool_create(sizeof(struct pppoe_conn_t)); pado_pool = mempool_create(sizeof(struct delayed_pado_t)); diff --git a/accel-pppd/ctrl/pptp/pptp.c b/accel-pppd/ctrl/pptp/pptp.c index 456b85a4..2f0c5efd 100644 --- a/accel-pppd/ctrl/pptp/pptp.c +++ b/accel-pppd/ctrl/pptp/pptp.c @@ -762,7 +762,8 @@ static void pptp_init(void) struct sockaddr_in addr; char *opt; - system("modprobe pptp"); + if (system("modprobe -q pptp")) + log_warn("failed to load pptp kernel module\n"); serv.hnd.fd = socket(PF_INET, SOCK_STREAM, 0); if (serv.hnd.fd < 0) { diff --git a/accel-pppd/shaper/limiter.c b/accel-pppd/shaper/limiter.c index 92e343b7..5a3142bd 100644 --- a/accel-pppd/shaper/limiter.c +++ b/accel-pppd/shaper/limiter.c @@ -488,7 +488,8 @@ int init_ifb(const char *name) .qdisc = qdisc_htb_root, }; - system("modprobe ifb"); + if (system("modprobe -q ifb")) + log_warn("failed to load ifb kernel module\n"); memset(&ifr, 0, sizeof(ifr)); strcpy(ifr.ifr_name, name); -- cgit v1.2.3