[PATCH] isar-events: Fix processing of /proc/mounts

[PATCH] isar-events: Fix processing of /proc/mounts

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

We have to read /proc/mounts completely before starting to umount. That
virtual file will change after each umount, and that could make us miss
some mount points.

Fixes: 05d0fc43e9e9 ("isar-events: Improve umount handler")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/isar-events.bbclass | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass
index 05b27e5..c4a6149 100644
--- a/meta/classes/isar-events.bbclass
+++ b/meta/classes/isar-events.bbclass
@@ -18,10 +18,11 @@ python isar_handler() {
 
     with open(os.devnull, 'w') as devnull:
         with open('/proc/mounts', 'rU') as f:
-            for line in f:
-                if basepath in line:
-                    subprocess.call('sudo umount -l ' + line.split()[1],
-                                    stdout=devnull, stderr=devnull, shell=True)
+            lines = f.readlines()
+        for line in lines:
+            if basepath in line:
+                subprocess.call('sudo umount -l ' + line.split()[1],
+                                stdout=devnull, stderr=devnull, shell=True)
 }
 
 isar_handler[eventmask] = "bb.runqueue.runQueueExitWait bb.event.BuildCompleted"
-- 
2.16.4

Re: [PATCH] isar-events: Fix processing of /proc/mounts

[Maxim Yu. Osipov]

On 12/9/18 7:06 PM, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> We have to read /proc/mounts completely before starting to umount. That
> virtual file will change after each umount, and that could make us miss
> some mount points.

Applied to the 'next',

Thanks,
Maxim.

> Fixes: 05d0fc43e9e9 ("isar-events: Improve umount handler")
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>   meta/classes/isar-events.bbclass | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass
> index 05b27e5..c4a6149 100644
> --- a/meta/classes/isar-events.bbclass
> +++ b/meta/classes/isar-events.bbclass
> @@ -18,10 +18,11 @@ python isar_handler() {
>   
>       with open(os.devnull, 'w') as devnull:
>           with open('/proc/mounts', 'rU') as f:
> -            for line in f:
> -                if basepath in line:
> -                    subprocess.call('sudo umount -l ' + line.split()[1],
> -                                    stdout=devnull, stderr=devnull, shell=True)
> +            lines = f.readlines()
> +        for line in lines:
> +            if basepath in line:
> +                subprocess.call('sudo umount -l ' + line.split()[1],
> +                                stdout=devnull, stderr=devnull, shell=True)
>   }
>   
>   isar_handler[eventmask] = "bb.runqueue.runQueueExitWait bb.event.BuildCompleted"
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov