asheplyakov/propagator
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

20121109-alt1

Browse Source 
- use /sbun/mount.nfs instead of /bin/nfsmount
This commit is contained in:
Anton V. Boyarshinov 2012-11-09 15:39:11 +04:00
parent 9f547f5cb8
commit 6210be0ac2
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mount.c
View File

@ -137,14 +137,14 @@ static int nfsmount(char *dev, char *location)
if ((sep = strchr(dev, ':'))) { if ((sep = strchr(dev, ':'))) {
*sep = '\0'; *sep = '\0';
} else { } else {
log_message("nfsmount: directory to mount not in host:dir format"); log_message("mount.nfs: directory to mount not in host:dir format");
return -1; return -1;
} }
saddr.sin_family = AF_INET; saddr.sin_family = AF_INET;
if (!inet_aton(dev, &saddr.sin_addr) && if (!inet_aton(dev, &saddr.sin_addr) &&
mygethostbyname(dev, &saddr.sin_addr)) { mygethostbyname(dev, &saddr.sin_addr)) {
log_message("nfsmount: can't get address for %s", dev); log_message("mount.nfs: can't get address for %s", dev);
*sep = ':'; *sep = ':';
return -1; return -1;
} }
@ -153,10 +153,10 @@ static int nfsmount(char *dev, char *location)
strcpy(spec, inet_ntoa(saddr.sin_addr)); strcpy(spec, inet_ntoa(saddr.sin_addr));
n = strlen(spec); n = strlen(spec);
strncpy(spec + n, sep, sizeof(spec) - n); strncpy(spec + n, sep, sizeof(spec) - n);
log_message("nfsmount %s %s", spec, location); log_message("mount.nfs %s %s", spec, location);
if (!(pid = fork())) { if (!(pid = fork())) {
char * argv[] = {"/bin/nfsmount", spec, location, NULL}; char * argv[] = {"/sbin/mount.nfs", "-onolock", spec, location, NULL};
close(0); close(0);
close(1); close(1);
close(2); close(2);

5
propagator.spec
View File

@ -2,7 +2,7 @@
%def_with splash %def_with splash
Name: propagator Name: propagator
Version: 20121002 Version: 20121109
Release: alt1 Release: alt1
Summary: 'Early userspace' set of binaries Summary: 'Early userspace' set of binaries
@ -37,6 +37,9 @@ make \
%_sbindir/propagator %_sbindir/propagator
%changelog %changelog
* Fri Nov 09 2012 Anton V. Boyarshinov <boyarsh@altlinux.ru> 20121109-alt1
- use /sbun/mount.nfs instead of /bin/nfsmount
* Tue Oct 02 2012 Anton V. Boyarshinov <boyarsh@altlinux.ru> 20121002-alt1 * Tue Oct 02 2012 Anton V. Boyarshinov <boyarsh@altlinux.ru> 20121002-alt1
- no more initfs - no more initfs