diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-04-09 22:25:12 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-04-09 22:25:12 +0000 |
| commit | 6b231d99aa8a523359c0b9c81fd09c4dde1f8bb5 (patch) | |
| tree | 86f26de13935585dbebc85520148a913bed91f49 | |
| parent | 5d46a28045cd74b0a42091a48f1d446afc1f5021 (diff) | |
| download | drakx-6b231d99aa8a523359c0b9c81fd09c4dde1f8bb5.tar drakx-6b231d99aa8a523359c0b9c81fd09c4dde1f8bb5.tar.gz drakx-6b231d99aa8a523359c0b9c81fd09c4dde1f8bb5.tar.bz2 drakx-6b231d99aa8a523359c0b9c81fd09c4dde1f8bb5.tar.xz drakx-6b231d99aa8a523359c0b9c81fd09c4dde1f8bb5.zip | |
Only write raid config into $::prefix if we are in install mode (#49632)
| -rw-r--r-- | perl-install/NEWS | 5 | ||||
| -rw-r--r-- | perl-install/raid.pm | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index aa6b3c8c4..2626d271b 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,8 @@ +- diskdrake: + o Only write raid config into $::prefix if we are in install mode, + this fixes draklive-install which should write to /etc directly as + $::prefix does not yet exist (#49632) + Version 12.25 - 08 April 2009 - harddrake service: diff --git a/perl-install/raid.pm b/perl-install/raid.pm index df59fb02e..79476e956 100644 --- a/perl-install/raid.pm +++ b/perl-install/raid.pm @@ -247,7 +247,7 @@ sub write_conf { my @devices = uniq(map { devices::make($_->{device}) } map { @{$_->{disks}} } @$raids); - output("$::prefix/etc/mdadm.conf", + output($::isInstall ? "$::prefix/etc/mdadm.conf" : "/etc/mdadm.conf", join(' ', 'DEVICE', @devices) . "\n", map { "ARRAY " . devices::make($_->{device}) . " UUID=$_->{UUID} auto=yes\n" } @$raids); } |