41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
|
From 5d79c72e16b32d7d6d0f535348286a7f2a966092 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "mwilck@arcor.de" <mwilck@arcor.de>
|
||
|
|
Date: Wed, 11 Sep 2013 22:15:19 +0200
|
||
|
|
Subject: [PATCH] mdmon: honour --offroot, again
|
||
|
|
|
||
|
|
commit 3e32ba9d removed support for --offroot, and a9c15847 made
|
||
|
|
mdmon use @ in argv[0] only when started from initrd.
|
||
|
|
|
||
|
|
This breaks mdadm in OpenSUSE 12.3, which starts mdmon from the
|
||
|
|
root file system and relies on --offroot to work as documented earlier.
|
||
|
|
|
||
|
|
Reintroducing --offroot as an undocumented option, as its use is going to
|
||
|
|
go away soon anyway.
|
||
|
|
|
||
|
|
If this can't be applied, it should probably be included as distro-specific
|
||
|
|
patch if mdadm 3.3 is built for OpenSUSE 12.3. I haven't checked if the
|
||
|
|
patch is necesary for OpenSUSE Factory, too.
|
||
|
|
|
||
|
|
Signed-off-by: Martin Wilck <mwilck@arcor.de>
|
||
|
|
Signed-off-by: NeilBrown <neilb@suse.de>
|
||
|
|
---
|
||
|
|
mdmon.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/mdmon.c b/mdmon.c
|
||
|
|
index f0b0623..8cd53d8 100644
|
||
|
|
--- a/mdmon.c
|
||
|
|
+++ b/mdmon.c
|
||
|
|
@@ -320,7 +320,7 @@ int main(int argc, char *argv[])
|
||
|
|
dofork = 0;
|
||
|
|
break;
|
||
|
|
case OffRootOpt:
|
||
|
|
- /* silently ignore old option */
|
||
|
|
+ argv[0][0] = '@';
|
||
|
|
break;
|
||
|
|
case 'h':
|
||
|
|
default:
|
||
|
|
--
|
||
|
|
1.8.3.1.487.g3e7a5b4
|
||
|
|
|