jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 15:30:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

salvager: alias -f to -force

Browse Source 
DAFS added the -forceDAFS flag, which made the '-f' flag ambiguous, when
it used to be short for '-force'. Restore the previous meaning of '-f'
to reduce backwards incompatibility.

FIXES 124916

Change-Id: Ieb864b35a91000960f9d9c503c28db56602df13e
Reviewed-on: http://gerrit.openafs.org/1254
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Andrew Deason 2010-02-08 15:03:08 -06:00 committed by Derrick Brashear
parent 8459dc317b
commit d914ad4c75
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vol/salvager.c
View File

@ -198,7 +198,7 @@ handleit(struct cmd_syndesc *as, void *arock)
Testing = 1; Testing = 1;
if (as->parms[4].items) /* -inodes */ if (as->parms[4].items) /* -inodes */
ListInodeOption = 1; ListInodeOption = 1;
if (as->parms[5].items) /* -force */ if (as->parms[5].items || as->parms[20].items) /* -force, -f */
ForceSalvage = 1; ForceSalvage = 1;
if (as->parms[6].items) /* -oktozap */ if (as->parms[6].items) /* -oktozap */
OKToZap = 1; OKToZap = 1;
@ -503,6 +503,8 @@ main(int argc, char **argv)
cmd_AddParm(ts, "-forceDAFS", CMD_FLAG, CMD_OPTIONAL, cmd_AddParm(ts, "-forceDAFS", CMD_FLAG, CMD_OPTIONAL,
"For Demand Attach Fileserver, permit a manual volume salvage outside of the salvageserver"); "For Demand Attach Fileserver, permit a manual volume salvage outside of the salvageserver");
#endif /* FAST_RESTART */ #endif /* FAST_RESTART */
cmd_Seek(ts, 20);
cmd_AddParm(ts, "-f", CMD_FLAG, CMD_OPTIONAL, "Alias for -force");
err = cmd_Dispatch(argc, argv); err = cmd_Dispatch(argc, argv);
Exit(err); Exit(err);
return 0; /* not reached */ return 0; /* not reached */