mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-31 21:18:26 +03:00
2955b913ea
Patch updates exec_cmd() and adds 3rd parameter with pointer for status value, so caller might examine returned status code. If the passed pointer is NULL, behavior is unmodified. Patch allows to confinue with lvresize if the failure from fsadm check is caused by mounted filesystem as many of filesystem resize tools do support online filesystem resize. (originally user had to use flag '-n' to bypass this filesystem check)
103 lines
2.2 KiB
C
103 lines
2.2 KiB
C
/*
|
|
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
|
|
* Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
|
|
*
|
|
* This file is part of LVM2.
|
|
*
|
|
* This copyrighted material is made available to anyone wishing to use,
|
|
* modify, copy, or redistribute it subject to the terms and conditions
|
|
* of the GNU Lesser General Public License v.2.1.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include "lib.h"
|
|
#include "device.h"
|
|
#include "locking.h"
|
|
#include "lvm-exec.h"
|
|
#include "toolcontext.h"
|
|
|
|
#include <unistd.h>
|
|
#include <sys/wait.h>
|
|
|
|
/*
|
|
* Create verbose string with list of parameters
|
|
*/
|
|
static char *_verbose_args(const char *const argv[], char *buf, size_t sz)
|
|
{
|
|
int pos = 0;
|
|
int len;
|
|
unsigned i;
|
|
|
|
buf[0] = '\0';
|
|
for (i = 0; argv[i]; i++) {
|
|
if ((len = dm_snprintf(buf + pos, sz - pos,
|
|
"%s ", argv[i])) < 0)
|
|
/* Truncated */
|
|
break;
|
|
pos += len;
|
|
}
|
|
|
|
return buf;
|
|
}
|
|
|
|
/*
|
|
* Execute and wait for external command
|
|
*/
|
|
int exec_cmd(struct cmd_context *cmd, const char *const argv[], int *rstatus)
|
|
{
|
|
pid_t pid;
|
|
int status;
|
|
char buf[PATH_MAX * 2];
|
|
|
|
log_verbose("Executing: %s", _verbose_args(argv, buf, sizeof(buf)));
|
|
|
|
if ((pid = fork()) == -1) {
|
|
log_error("fork failed: %s", strerror(errno));
|
|
return 0;
|
|
}
|
|
|
|
if (!pid) {
|
|
/* Child */
|
|
reset_locking();
|
|
dev_close_all();
|
|
/* FIXME Fix effect of reset_locking on cache then include this */
|
|
/* destroy_toolcontext(cmd); */
|
|
/* FIXME Use execve directly */
|
|
execvp(argv[0], (char **const) argv);
|
|
log_sys_error("execvp", argv[0]);
|
|
_exit(errno);
|
|
}
|
|
|
|
if (rstatus)
|
|
*rstatus = -1;
|
|
|
|
/* Parent */
|
|
if (wait4(pid, &status, 0, NULL) != pid) {
|
|
log_error("wait4 child process %u failed: %s", pid,
|
|
strerror(errno));
|
|
return 0;
|
|
}
|
|
|
|
if (!WIFEXITED(status)) {
|
|
log_error("Child %u exited abnormally", pid);
|
|
return 0;
|
|
}
|
|
|
|
if (WEXITSTATUS(status)) {
|
|
if (rstatus) {
|
|
*rstatus = WEXITSTATUS(status);
|
|
log_verbose("%s failed: %u", argv[0], *rstatus);
|
|
} else
|
|
log_error("%s failed: %u", argv[0], WEXITSTATUS(status));
|
|
return 0;
|
|
}
|
|
|
|
if (rstatus)
|
|
*rstatus = 0;
|
|
|
|
return 1;
|
|
}
|