• R/O
  • HTTP
  • SSH
  • HTTPS

alterlinux-calamares: 提交

GitHubのミラーです
https://github.com/FascodeNet/alterlinux-calamares


Commit MetaInfo

修订版2db3b413f47c5420f0d86e3a08d0e7ccb40b825f (tree)
时间2020-02-25 04:58:02
作者Adriaan de Groot <groot@kde....>
CommiterAdriaan de Groot

Log Message

[libcalamares] Unmount with mount point, not device

- The manpage for umount says that -R can only be used with

a mount point (e.g. /usr/local) and not a device name;
this makes sense because a device might be mounted in multiple
locations, but the mountpoint (and things mounted under it) lives
in the filesystem tree.

- Existing code tried to unmount -R the device, not the mount point,

and so always failed; leaving things mounted that shouldn't.

更改概述

差异

--- a/src/libcalamares/partition/Mount.cpp
+++ b/src/libcalamares/partition/Mount.cpp
@@ -117,7 +117,7 @@ TemporaryMount::~TemporaryMount()
117117 {
118118 if ( m_d )
119119 {
120- int r = unmount( m_d->m_devicePath, { "-R" } );
120+ int r = unmount( m_d->m_mountDir.path(), { "-R" } );
121121 if ( r )
122122 {
123123 cWarning() << "UnMount of temporary" << m_d->m_devicePath << "on" << m_d->m_mountDir.path()
Show on old repository browser