rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 02:49:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make the devices commands to fail if unsupported in the platform

Browse source
This commit is contained in:
Andrea Mazzoleni 2026-05-21 14:51:01 +02:00
parent ee5c7ebf13
commit 23b4cc5fa0
3 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmdline/device.c
View file

@ -1006,7 +1006,7 @@ int devtest(tommy_list* high, tommy_list* low, int operation)
return 0;
}
void state_device(struct snapraid_state* state, int operation, tommy_list* filterlist_disk)
int state_device(struct snapraid_state* state, int operation, tommy_list* filterlist_disk)
{
tommy_node* i;
unsigned j;
@ -1150,5 +1150,7 @@ void state_device(struct snapraid_state* state, int operation, tommy_list* filte
tommy_list_foreach(&high, free);
tommy_list_foreach(&low, free);
return ret;
}

30
cmdline/snapraid.c
View file

@ -1951,18 +1951,38 @@ int snapraid_main(int argc, char* argv[])
state_write(&state);
} else if (operation == OPERATION_SPINUP) {
state_device(&state, DEVICE_UP, &filterlist_disk);
ret = state_device(&state, DEVICE_UP, &filterlist_disk);
#if HAVE_CHECKER
if (ret < 0)
ret = 0; /* ignore errors in test environment */
#endif
} else if (operation == OPERATION_SPINDOWN) {
state_device(&state, DEVICE_DOWN, &filterlist_disk);
ret = state_device(&state, DEVICE_DOWN, &filterlist_disk);
#if HAVE_CHECKER
if (ret < 0)
ret = 0; /* ignore errors in test environment */
#endif
} else if (operation == OPERATION_DEVICES) {
state_device(&state, DEVICE_LIST, 0);
ret = state_device(&state, DEVICE_LIST, 0);
#if HAVE_CHECKER
if (ret < 0)
ret = 0; /* ignore errors in test environment */
#endif
} else if (operation == OPERATION_SMART) {
state_device(&state, DEVICE_SMART, 0);
ret = state_device(&state, DEVICE_SMART, 0);
#if HAVE_CHECKER
if (ret < 0)
ret = 0; /* ignore errors in test environment */
#endif
} else if (operation == OPERATION_PROBE) {
/* probe also the content file */
state_probe(&state);
state_device(&state, DEVICE_PROBE, 0);
ret = state_device(&state, DEVICE_PROBE, 0);
#if HAVE_CHECKER
if (ret < 0)
ret = 0; /* ignore errors in test environment */
#endif
} else if (operation == OPERATION_STATUS) {
state_read(&state);

2
cmdline/state.h
View file

@ -250,7 +250,7 @@ void state_touch(struct snapraid_state* state);
/**
* Devices operations.
*/
void state_device(struct snapraid_state* state, int operation, tommy_list* filterlist_disk);
int state_device(struct snapraid_state* state, int operation, tommy_list* filterlist_disk);
/**
* Sync the parity data.