X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2Frebootmgr.c;h=08528b28bb420a10a11889e685df4d99c57d4aa9;hb=a917f24ef7b003dcef54a3db2644cf9cb4bc2db2;hp=199452a97964899733044422c5b12367f3f445f2;hpb=9dbaad751b3abd6eddf6f0274fb136fb0d0dbe97;p=util-vserver.git diff --git a/util-vserver/src/rebootmgr.c b/util-vserver/src/rebootmgr.c index 199452a..08528b2 100644 --- a/util-vserver/src/rebootmgr.c +++ b/util-vserver/src/rebootmgr.c @@ -40,11 +40,13 @@ #ifdef HAVE_CONFIG_H # include #endif +#include "pathconfig.h" #include #include #include #include +#include #include #include #include @@ -65,7 +67,7 @@ static int rebootmgr_opensocket (const char *vname) int ret = -1; char sockn[PATH_MAX]; int fd = socket (AF_UNIX,SOCK_STREAM,0); - sprintf (sockn,"/vservers/%s/dev/reboot",vname); + sprintf (sockn, DEFAULT_VSERVERDIR "/%s/dev/reboot",vname); unlink (sockn); if (fd == -1){ fprintf (stderr,"Can't create a unix domain socket (%s)\n" @@ -103,13 +105,13 @@ static int rebootmgr_process (int fd, const char *vname) if (strcmp(buf,"reboot\n")==0){ char cmd[1000]; syslog (LOG_NOTICE,"reboot vserver %s\n",vname); - snprintf (cmd,sizeof(cmd)-1,"/usr/sbin/vserver %s restart >>/var/log/boot.log 2>&1",vname); + snprintf (cmd,sizeof(cmd)-1, SBINDIR "/vserver %s restart >>/var/log/boot.log 2>&1", vname); system (cmd); ret = 0; }else if (strcmp(buf,"halt\n")==0){ char cmd[1000]; syslog (LOG_NOTICE,"halt vserver %s\n",vname); - snprintf (cmd,sizeof(cmd)-1,"/usr/sbin/vserver %s stop >>/var/log/boot.log 2>&1",vname); + snprintf (cmd,sizeof(cmd)-1, SBINDIR "/vserver %s stop >>/var/log/boot.log 2>&1", vname); system (cmd); ret = 0; }else{ @@ -201,7 +203,7 @@ int main (int argc, char *argv[]) int fd = sockets[i]; if (FD_ISSET(fd,&fdin)){ struct sockaddr_un unc; - size_t len = sizeof(unc); + socklen_t len = sizeof(unc); unc.sun_family = AF_UNIX; fd = accept (fd,(struct sockaddr*)&unc,&len); if (fd != -1){