diff options
author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2012-01-25 15:18:02 +0100 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2012-01-30 12:11:16 +1100 |
commit | 08ca2adffffeb3bfda3cafababfc26706a60463b (patch) | |
tree | b44c11d30e02c6e6f0dd5ac0e84467778bb84e5f | |
parent | eb155f6de0986dc14c37dc9c4172bf0bcb8779fe (diff) |
Add --offroot argument to mdadm
When --offroot is specified, mdadm will change the first character of
argv[0] to '@'. This is used to signal to systemd that mdadm was
launched from initramfs and should not be shut down before returning
to the initramfs.
Acked-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r-- | ReadMe.c | 5 | ||||
-rw-r--r-- | mdadm.8.in | 12 | ||||
-rw-r--r-- | mdadm.c | 9 | ||||
-rw-r--r-- | mdadm.h | 1 |
4 files changed, 27 insertions, 0 deletions
@@ -111,6 +111,7 @@ struct option long_options[] = { {"kill-subarray", 1, 0, KillSubarray}, {"update-subarray", 1, 0, UpdateSubarray}, {"udev-rules", 2, 0, UdevRules}, + {"offroot", 0, 0, OffRootOpt}, /* synonyms */ {"monitor", 0, 0, 'F'}, @@ -268,6 +269,10 @@ char OptionHelp[] = " --query -Q : Display general information about how a\n" " device relates to the md driver\n" " --auto-detect : Start arrays auto-detected by the kernel\n" +" --offroot : Set first character of argv[0] to @ to indicate the\n" +" application was launched from initrd/initramfs and\n" +" should not be shutdown by systemd as part of the\n" +" regular shutdown process.\n" ; /* "\n" @@ -255,6 +255,18 @@ Avoid printing purely informative messages. With this, will be silent unless there is something really important to report. .TP +.BR \-\-offroot +Set first character of argv[0] to @ to indicate mdadm was launched +from initrd/initramfs and should not be shutdown by systemd as part of +the regular shutdown process. This option is normally only used by +the system's initscripts. Please see here for more details on how +systemd handled argv[0]: +.IP +.B http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons +.PP + + +.TP .BR \-f ", " \-\-force Be more forceful about certain operations. See the various modes for the exact meaning of this option in different contexts. @@ -174,6 +174,15 @@ int main(int argc, char *argv[]) homehost = optarg; continue; + /* + * --offroot sets first char of argv[0] to @. This is used + * by systemd to signal that the tast was launched from + * initrd/initramfs and should be preserved during shutdown + */ + case OffRootOpt: + argv[0][0] = '@'; + continue; + case ':': case '?': fputs(Usage, stderr); @@ -321,6 +321,7 @@ enum special_options { UdevRules, FreezeReshape, Continue, + OffRootOpt, }; /* structures read from config file */ |