1
0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00

fsck: Search for fsck.type in PATH

Modifies find_binary() to accept NULL in the second argument.

fsck.type lookup logic moved to new fsck_exists() function, with a test.
This commit is contained in:
Mike Gilbert 2014-04-12 16:07:45 -04:00 committed by Zbigniew Jędrzejewski-Szmek
parent b189101727
commit eb66db55fc
5 changed files with 47 additions and 27 deletions

View File

@ -37,6 +37,7 @@
#include "bus-errors.h"
#include "fileio.h"
#include "udev-util.h"
#include "path-util.h"
static bool arg_skip = false;
static bool arg_force = false;
@ -285,14 +286,13 @@ int main(int argc, char *argv[]) {
type = udev_device_get_property_value(udev_device, "ID_FS_TYPE");
if (type) {
const char *checker = strappenda("/sbin/fsck.", type);
r = access(checker, X_OK);
r = fsck_exists(type);
if (r < 0) {
if (errno == ENOENT) {
log_info("%s doesn't exist, not checking file system.", checker);
if (r == -ENOENT) {
log_info("fsck.%s doesn't exist, not checking file system.", type);
return EXIT_SUCCESS;
} else
log_warning("%s cannot be used: %m", checker);
log_warning("fsck.%s cannot be used: %s", type, strerror(-r));
}
}

View File

@ -19,6 +19,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <string.h>
#include <unistd.h>
#include "util.h"
@ -26,6 +27,7 @@
#include "mkdir.h"
#include "unit-name.h"
#include "generator.h"
#include "path-util.h"
int generator_write_fsck_deps(
FILE *f,
@ -45,16 +47,12 @@ int generator_write_fsck_deps(
}
if (!isempty(fstype) && !streq(fstype, "auto")) {
const char *checker;
int r;
checker = strappenda("/sbin/fsck.", fstype);
r = access(checker, X_OK);
r = fsck_exists(fstype);
if (r < 0) {
log_warning("Checking was requested for %s, but %s cannot be used: %m", what, checker);
log_warning("Checking was requested for %s, but fsck.%s cannot be used: %s", what, fstype, strerror(-r));
/* treat missing check as essentially OK */
return errno == ENOENT ? 0 : -errno;
return r == -ENOENT ? 0 : r;
}
}

View File

@ -425,19 +425,20 @@ int path_is_os_tree(const char *path) {
int find_binary(const char *name, char **filename) {
assert(name);
assert(filename);
if (strchr(name, '/')) {
char *p;
if (filename) {
char *p;
if (path_is_absolute(name))
p = strdup(name);
else
p = path_make_absolute_cwd(name);
if (!p)
return -ENOMEM;
if (path_is_absolute(name))
p = strdup(name);
else
p = path_make_absolute_cwd(name);
if (!p)
return -ENOMEM;
*filename = p;
}
*filename = p;
return 0;
} else {
const char *path;
@ -453,18 +454,19 @@ int find_binary(const char *name, char **filename) {
path = DEFAULT_PATH;
FOREACH_WORD_SEPARATOR(w, l, path, ":", state) {
char *p;
_cleanup_free_ char *p = NULL;
if (asprintf(&p, "%.*s/%s", (int) l, w, name) < 0)
return -ENOMEM;
if (access(p, X_OK) < 0) {
free(p);
if (access(p, X_OK) < 0)
continue;
}
path_kill_slashes(p);
*filename = p;
if (filename) {
path_kill_slashes(p);
*filename = p;
p = NULL;
}
return 0;
}
@ -507,3 +509,10 @@ bool paths_check_timestamp(const char* const* paths, usec_t *timestamp, bool upd
return changed;
}
int fsck_exists(const char *fstype) {
const char *checker;
checker = strappenda("fsck.", fstype);
return find_binary(checker, NULL);
}

View File

@ -57,6 +57,8 @@ int find_binary(const char *name, char **filename);
bool paths_check_timestamp(const char* const* paths, usec_t *paths_ts_usec, bool update);
int fsck_exists(const char *fstype);
/* Iterates through the path prefixes of the specified path, going up
* the tree, to root. Also returns "" (and not "/"!) for the root
* directory. Excludes the specified directory itself */

View File

@ -158,9 +158,20 @@ static void test_prefixes(void) {
}
}
static void test_fsck_exists(void) {
/* Ensure we use a sane default for PATH. */
unsetenv("PATH");
/* fsck.minix is provided by util-linux and will probably exist. */
assert_se(fsck_exists("minix") == 0);
assert_se(fsck_exists("AbCdE") == -ENOENT);
}
int main(void) {
test_path();
test_find_binary();
test_prefixes();
test_fsck_exists();
return 0;
}