diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-08-21 14:57:31 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-08-21 14:57:31 +0000 |
| commit | 1be42769f9512b81961f270f91c3af5b8a942230 (patch) | |
| tree | dc925b36677a6e54489885fb541833fc4c17276c | |
| parent | 93810de8906bd9decf0e2d34bdaf429a415517d5 (diff) | |
| download | drakx-1be42769f9512b81961f270f91c3af5b8a942230.tar drakx-1be42769f9512b81961f270f91c3af5b8a942230.tar.gz drakx-1be42769f9512b81961f270f91c3af5b8a942230.tar.bz2 drakx-1be42769f9512b81961f270f91c3af5b8a942230.tar.xz drakx-1be42769f9512b81961f270f91c3af5b8a942230.zip | |
- diskdrake:
o fix displaying umount error message (#32273)
(would need a little cleaning of stderr)
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/fs/mount.pm | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index f1cc2f705..b291989f5 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,4 +1,5 @@ - diskdrake: + o fix displaying umount error message (#32273) o write mdadm.conf when it is modified (#32360) (a nicer fix would be to write it when needed, not so soon, but it's harder) diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm index baf1ce837..5687ac4d3 100644 --- a/perl-install/fs/mount.pm +++ b/perl-install/fs/mount.pm @@ -115,7 +115,8 @@ sub umount { run_program::run('umount', $mntpoint) or do { kill 15, fuzzy_pidofs('^fam\b'); - run_program::run('umount', $mntpoint) or die N("error unmounting %s: %s", $mntpoint, $!); + my $err; + run_program::run('umount', '2>', \$err, $mntpoint) or die N("error unmounting %s: %s", $mntpoint, $err); }; substInFile { $_ = '' if /(^|\s)$mntpoint\s/ } '/etc/mtab'; #- do not care about error, if we can not read, we will not manage to write... (and mess mtab) |