diff options
| author | Doug Ledford <dledford@redhat.com> | 2010-04-15 15:11:37 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2010-04-15 15:11:37 -0400 |
| commit | e53cca512da24c8d92ed469ea92f4ecd8869547c (patch) | |
| tree | 183eb4c08808d5b5ad8bcde3ca8f7b781c3ebc35 | |
| parent | a62eba198bc49379b34690be6082fe93aefbfd3b (diff) | |
| download | mdadm-e53cca512da24c8d92ed469ea92f4ecd8869547c.tar.gz mdadm-e53cca512da24c8d92ed469ea92f4ecd8869547c.tar.xz mdadm-e53cca512da24c8d92ed469ea92f4ecd8869547c.zip | |
In preparation for new incremental --grab support, update Makefile to
install new udev early rules, update ReadMe.c for new options to pass
to incremental mode, update udev rules file for new options.
Signed-off-by: Doug Ledford <dledford@redhat.com>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | ReadMe.c | 14 | ||||
| -rw-r--r-- | udev-early-md.rules | 2 |
3 files changed, 11 insertions, 8 deletions
@@ -223,7 +223,8 @@ install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8 $(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4 $(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 -install-udev: udev-md-raid.rules +install-udev: udev-md-raid.rules udev-early-md.rules + $(INSTALL) -D -m 644 udev-early-md.rules $(DESTDIR)/lib/udev/rules.d/05-md-early.rules $(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)/lib/udev/rules.d/64-md-raid.rules uninstall: @@ -87,11 +87,11 @@ char Version[] = Name " - v3.1.2-dledford - 30th March 2010\n"; */ char short_options[]= - "-ABCDEFGIQhVXWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tyge:"; + "-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tyge:"; char short_bitmap_options[]= - "-ABCDEFGIQhVXWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tyge:"; + "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tyge:"; char short_bitmap_auto_options[]= - "-ABCDEFGIQhVXWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tyge:"; + "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tyge:"; struct option long_options[] = { {"manage", 0, 0, '@'}, @@ -169,7 +169,7 @@ struct option long_options[] = { /* For Detail/Examine */ {"brief", 0, 0, 'b'}, - {"export", 0, 0, 'Y'}, + {"export", 0, 0, 'Y'}, /* used for Incremental now too */ {"sparc2.2", 0, 0, Sparc22}, {"test", 0, 0, 't'}, @@ -248,8 +248,8 @@ char OptionHelp[] = " --verbose -v : Be more verbose about what is happening\n" " --quiet -q : Don't print un-necessary messages\n" " --brief -b : Be less verbose, more brief\n" -" --export -Y : With --detail, use key=value format for easy\n" -" import into environment\n" +" --export -Y : With --detail, --examine, and --incremental use\n" +" key=value format for easy import into environment\n" " --force -f : Override normal checks and be more forceful\n" "\n" " --assemble -A : Assemble an array\n" @@ -562,6 +562,8 @@ char Help_incr[] = " : take it for the purpose listed in said DOMAIN line.\n" " --fail -f : First fail (if needed) and then remove device from\n" " : any array that it is a member of.\n" +" --export -Y : Output the results in a format that is consumable as\n" +" : environment variables by udev. Only used with --grab.\n" ; char Help_config[] = diff --git a/udev-early-md.rules b/udev-early-md.rules index 176ad61..e010dab 100644 --- a/udev-early-md.rules +++ b/udev-early-md.rules @@ -16,7 +16,7 @@ ENV{ID_FS_TYPE}=="linux_raid_member", GOTO="md_end" # do something with this device if it determines that it should own it. # That allows us to program in whatever smarts are needed into mdadm, # but at the expense of running mdadm on every blk device add|change event :-( -IMPORT{program}="/sbin/mdadm -I --new-device $tempnode" +IMPORT{program}="/sbin/mdadm -IYg $tempnode" ENV{MD_OWNED}!="?*", GOTO="md_end" # We owned the device, so have udev reset the database info in case we # changed it |