Changeset 8761

Timestamp:

Nov 6, 2019, 4:10:16 PM (18 months ago)

Author:

mabarracus

Message:

Lliurex-version: Fix live detection

Location:

lliurex-base-files/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• install/usr/bin/lliurex-version (modified) (1 diff)

lliurex-base-files/trunk/fuentes/debian/changelog

@@ +1 @@
+lliurex-base-files (16.06.27) xenial; urgency=medium
+
+  * Lliurex-version: Fix live detection
+
+ -- M.Angel Juan <m.angel.juan@gmail.com>  Wed, 06 Nov 2019 16:09:37 +0100
+
 lliurex-base-files (16.06.26) xenial; urgency=high
 

lliurex-base-files/trunk/fuentes/install/usr/bin/lliurex-version

@@ -22 +22 @@
 
 def detect_live():
-    test1=False
+    #test1=False
     test2=False
     test3=False
 
     if os.path.isdir('/rofs'):
-        r1=re.compile('^tmpfs\s/cow\stmpfs')
-        r2=re.compile('^/cow\s/\soverlayfs')
+        #r1=re.compile('^tmpfs\s/cow\stmpfs')
+        r2=re.compile('^/cow\s/\soverlay')
         r3=re.compile('^/dev/loop0\s/rofs\ssquashfs')
         with open('/proc/mounts') as mounts_file:
             for line in mounts_file.readlines():
-                if r1.match(line):
-                    test1=True
+                #if r1.match(line):
+                #    test1=True
                 if r2.match(line):
                     test2=True
                 if r3.match(line):
                     test3=True
-    if test1 and test2 and test3:
+    if test2 and test3:
         pass
     else: