fd828476e8
- Update mdadm init script so that status will always run and so return
codes are standards compliant
- Fix assembly of version 1 superblock devices
- Make the attempt to create an already running device have a clearer error
message
- Allow the creation of a degraded raid4 array like we allow for raid5
- Make mdadm actually pay attention to raid4 devices when in monitor mode
- Make the mdmonitor script use daemon() correctly
- Fix a bug where manage mode would not add disks correctly under certain
conditions
- Resolves: bz244582, bz242688, bz230207, bz169596, bz171862, bz171938
- Resolves: bz174642, bz224272, bz186524
51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
--- mdadm-2.6.2/mdadm.h.manage 2007-07-03 15:37:10.000000000 -0400
|
|
+++ mdadm-2.6.2/mdadm.h 2007-07-03 15:37:53.000000000 -0400
|
|
@@ -155,6 +155,7 @@ enum mode {
|
|
};
|
|
|
|
extern char short_options[];
|
|
+extern char short_bitmap_options[];
|
|
extern char short_bitmap_auto_options[];
|
|
extern struct option long_options[];
|
|
extern char Version[], Usage[], Help[], OptionHelp[],
|
|
--- mdadm-2.6.2/mdadm.c.manage 2007-07-03 13:21:40.000000000 -0400
|
|
+++ mdadm-2.6.2/mdadm.c 2007-07-03 15:35:54.000000000 -0400
|
|
@@ -180,7 +180,7 @@ int main(int argc, char *argv[])
|
|
switch(opt) {
|
|
case '@': /* just incase they say --manage */
|
|
newmode = MANAGE;
|
|
- shortopt = short_bitmap_auto_options;
|
|
+ shortopt = short_bitmap_options;
|
|
break;
|
|
case 'a':
|
|
case 'r':
|
|
@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
|
|
case ReAdd: /* re-add */
|
|
if (!mode) {
|
|
newmode = MANAGE;
|
|
- shortopt = short_bitmap_auto_options;
|
|
+ shortopt = short_bitmap_options;
|
|
}
|
|
break;
|
|
|
|
@@ -196,7 +196,7 @@ int main(int argc, char *argv[])
|
|
case 'B': newmode = BUILD; shortopt = short_bitmap_auto_options; break;
|
|
case 'C': newmode = CREATE; shortopt = short_bitmap_auto_options; break;
|
|
case 'F': newmode = MONITOR;break;
|
|
- case 'G': newmode = GROW; shortopt = short_bitmap_auto_options; break;
|
|
+ case 'G': newmode = GROW; shortopt = short_bitmap_options; break;
|
|
case 'I': newmode = INCREMENTAL; break;
|
|
case AutoDetect:
|
|
newmode = AUTODETECT; break;
|
|
--- mdadm-2.6.2/ReadMe.c.manage 2007-07-03 15:37:35.000000000 -0400
|
|
+++ mdadm-2.6.2/ReadMe.c 2007-07-03 15:36:00.000000000 -0400
|
|
@@ -87,6 +87,8 @@ char Version[] = Name " - v2.6.2 - 21st
|
|
*/
|
|
|
|
char short_options[]="-ABCDEFGIQhVXWvqbc:i:l:p:m:n:x:u:c:d:z:U:sarfRSow1tye:";
|
|
+char short_bitmap_options[]=
|
|
+ "-ABCDEFGIQhVXWvqb:c:i:l:p:m:n:x:u:c:d:z:U:sarfRSow1tye:";
|
|
char short_bitmap_auto_options[]=
|
|
"-ABCDEFGIQhVXWvqb:c:i:l:p:m:n:x:u:c:d:z:U:sa:rfRSow1tye:";
|
|
|