|
 |
027535 |
---
|
|
|
027535 |
kpartx/kpartx.c | 10 +++++++---
|
|
|
027535 |
multipath/multipath.rules | 2 +-
|
|
|
027535 |
2 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
027535 |
|
|
|
027535 |
Index: multipath-bz1330480/kpartx/kpartx.c
|
|
|
027535 |
===================================================================
|
|
|
027535 |
--- multipath-bz1330480.orig/kpartx/kpartx.c
|
|
|
027535 |
+++ multipath-bz1330480/kpartx/kpartx.c
|
|
|
027535 |
@@ -57,7 +57,7 @@ struct pt {
|
|
|
027535 |
} pts[MAXTYPES];
|
|
|
027535 |
|
|
|
027535 |
int ptct = 0;
|
|
|
027535 |
-int udev_sync = 0;
|
|
|
027535 |
+int udev_sync = 1;
|
|
|
027535 |
|
|
|
027535 |
static void
|
|
|
027535 |
addpts(char *t, ptreader f)
|
|
|
027535 |
@@ -85,7 +85,7 @@ initpts(void)
|
|
|
027535 |
addpts("ps3", read_ps3_pt);
|
|
|
027535 |
}
|
|
|
027535 |
|
|
|
027535 |
-static char short_opts[] = "rladfgvp:t:su";
|
|
|
027535 |
+static char short_opts[] = "rladfgvp:t:snu";
|
|
|
027535 |
|
|
|
027535 |
/* Used in gpt.c */
|
|
|
027535 |
int force_gpt=0;
|
|
|
027535 |
@@ -104,7 +104,8 @@ usage(void) {
|
|
|
027535 |
printf("\t-g force GUID partition table (GPT)\n");
|
|
|
027535 |
printf("\t-f force devmap create\n");
|
|
|
027535 |
printf("\t-v verbose\n");
|
|
|
027535 |
- printf("\t-s sync mode. Don't return until the partitions are created\n");
|
|
|
027535 |
+ printf("\t-n nosync mode. Return before the partitions are created\n");
|
|
|
027535 |
+ printf("\t-s sync mode. Don't return until the partitions are created. Default.\n");
|
|
|
027535 |
return 1;
|
|
|
027535 |
}
|
|
|
027535 |
|
|
|
027535 |
@@ -270,6 +271,9 @@ main(int argc, char **argv){
|
|
|
027535 |
case 's':
|
|
|
027535 |
udev_sync = 1;
|
|
|
027535 |
break;
|
|
|
027535 |
+ case 'n':
|
|
|
027535 |
+ udev_sync = 0;
|
|
|
027535 |
+ break;
|
|
|
027535 |
case 'u':
|
|
|
027535 |
what = UPDATE;
|
|
|
027535 |
break;
|
|
|
027535 |
Index: multipath-bz1330480/multipath/multipath.rules
|
|
|
027535 |
===================================================================
|
|
|
027535 |
--- multipath-bz1330480.orig/multipath/multipath.rules
|
|
|
027535 |
+++ multipath-bz1330480/multipath/multipath.rules
|
|
|
027535 |
@@ -48,6 +48,6 @@ ENV{DM_ACTIVATION}=="1", ENV{DM_MULTIPAT
|
|
|
027535 |
ENV{DM_SUSPENDED}=="1", GOTO="end_mpath"
|
|
|
027535 |
ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath"
|
|
|
027535 |
ENV{DM_ACTIVATION}!="1", ENV{DM_MULTIPATH_NEED_KPARTX}!="1", GOTO="end_mpath"
|
|
|
027535 |
-RUN+="$env{MPATH_SBIN_PATH}/kpartx -a $tempnode", \
|
|
|
027535 |
+RUN+="$env{MPATH_SBIN_PATH}/kpartx -an $tempnode", \
|
|
|
027535 |
ENV{DM_MULTIPATH_NEED_KPARTX}=""
|
|
|
027535 |
LABEL="end_mpath"
|