RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-01-02 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

marsadm: fix unintended mointpoint warning

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2022-05-17 03:15:08 +02:00
parent 1c6d0fd2bd
commit 76638f90d5
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
userspace/marsadm
View File

@ -11244,11 +11244,27 @@ sub do_all_res {
}
}
sub no_mountpoint {
my ($pathname) = @_;
my $cmd = "/bin/mountpoint";
if (! -x $cmd) {
$cmd = "/usr/bin/mountpoint";
}
if (! -x $cmd) {
$cmd = "/usr/local/bin/mountpoint";
}
if (! -x $cmd) {
lwarn "cannot determine whether '$pathname' is a mountpoint - please install the tool 'mountpoint'\n";
return 0;
}
return system("$cmd $pathname >/dev/null 2>&1");
}
if ($cmd =~ m/^(view|pretty)/) {
if (! -d $mars) {
lwarn "directory $mars does not exist - please read mars-user-manual.pdf\n";
} elsif (system("/usr/bin/mountpoint $mars >/dev/null")) {
lwarn "directory $mars is NOT a mountpoint - please mount it.\n";
} elsif (no_mountpoint($mars)) {
lwarn "directory $mars is NOT a recognized mountpoint - please mount it.\n";
} elsif (! -l "$mars/uuid") {
lwarn "no cluster uuid found -- be sure to FULLY UNDERSTAND what you need to do, by reading mars-user-manual.pdf\n";
}