napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[unpackfs] merge with upstream master branch

Browse Source
This commit is contained in:
Philip 2018-01-14 15:53:01 -05:00
parent 84a29ddfec
commit 78671a1547
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/unpackfs/main.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# === This file is part of Calamares - <http://github.com/calamares> === # === This file is part of Calamares - <https://github.com/calamares> ===
# #
# Copyright 2014, Teo Mrnjavac <teo@kde.org> # Copyright 2014, Teo Mrnjavac <teo@kde.org>
# Copyright 2014, Daniel Hillenbrand <codeworkx@bbqlinux.org> # Copyright 2014, Daniel Hillenbrand <codeworkx@bbqlinux.org>
@ -218,7 +218,7 @@ class UnpackOperation:
return None return None
finally: finally:
shutil.rmtree(source_mount_path) shutil.rmtree(source_mount_path, ignore_errors=True, onerror=None)
def mount_image(self, entry, imgmountdir): def mount_image(self, entry, imgmountdir):
""" """

6
src/modules/unpackfs/unpackfs.conf
View File

@ -33,8 +33,6 @@ unpack:
# You can list filesystem source paths relative to the Calamares run # You can list filesystem source paths relative to the Calamares run
# directory, if you use -d (this is only useful for testing, though). # directory, if you use -d (this is only useful for testing, though).
- source: "_root-image_" - source: ./example.sqfs
sourcefs: "squashfs" sourcefs: squashfs
destination: "" destination: ""
- source: "_desktop-image_"
sourcefs: "squashfs"