baselayout, fuse rebuild

system/base/baselayout/actions.py

@@ -19,15 +19,24 @@ def install():
 
     # Install everything
     pisitools.insinto("/", "root/*")
-    
+
     # Install baselayout utilities
     shelltools.cd("src/")
     autotools.rawInstall('DESTDIR="%s"' % get.installDIR())
-    
+
+    shelltools.system("ls")
+
+    # Dirty fix for now... (especially for flatpak)
+    shelltools.system("mv %s/run/* %s/dev" % (get.installDIR(), get.installDIR()))
+    pisitools.remove("/var/lock")
+    # shelltools.cd("%s/var" % get.installDIR())
+    shelltools.system("ln -rs %s/dev/lock %s/var/lock" % (get.installDIR(), get.installDIR()))
+    # shelltools.cd("%s/baselayout/src" % get.workDIR())
+
     # Adjust permissions
     chmod("/tmp", 01777)
     chmod("/var/tmp", 01777)
-    chmod("/run/shm", 01777)
+    chmod("/dev/shm", 01777)
     chmod("/var/lock", 0775)
     chmod("/usr/share/baselayout/shadow", 0600)
 
@@ -40,6 +49,6 @@ def install():
         pisitools.dosym("lib", "/lib64")
 
     pisitools.dosym("pisilinux-release", "/etc/system-release")
-    
+
     #File conflicts:
     pisitools.removeDir("/usr/share/man/man4")