mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-12 07:42:56 +00:00
qemu-ns: Detect /dev/* mount point duplicates even better
In 4f1570720218302 I've tried to make duplicates detection for nested /dev mount better. However, I've missed the obvious case when there are two same mount points. For instance if: # mount --bind /dev/blah /dev/blah # mount --bind /dev/blah /dev/blah Yeah, very unlikely (in qemu driver world) but possible. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
0a3bae7d22
commit
3d899b9965
@ -8352,7 +8352,7 @@ qemuDomainGetPreservedMounts(virQEMUDriverConfigPtr cfg,
|
|||||||
while (j < nmounts) {
|
while (j < nmounts) {
|
||||||
char *c = STRSKIP(mounts[j], mounts[i]);
|
char *c = STRSKIP(mounts[j], mounts[i]);
|
||||||
|
|
||||||
if (c && *c == '/') {
|
if (c && (*c == '/' || *c == '\0')) {
|
||||||
VIR_DEBUG("Dropping path %s because of %s", mounts[j], mounts[i]);
|
VIR_DEBUG("Dropping path %s because of %s", mounts[j], mounts[i]);
|
||||||
VIR_DELETE_ELEMENT(mounts, j, nmounts);
|
VIR_DELETE_ELEMENT(mounts, j, nmounts);
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user