Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Calamares
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
osak
Calamares
Commits
71d08a89
Commit
71d08a89
authored
8 years ago
by
Adriaan de Groot
Committed by
Philip
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[unpackfs] fix merge
parent
d6d8e735
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/modules/unpackfs/main.py
+1
-16
1 addition, 16 deletions
src/modules/unpackfs/main.py
src/modules/unpackfs/unpackfs.conf
+16
-0
16 additions, 0 deletions
src/modules/unpackfs/unpackfs.conf
with
17 additions
and
16 deletions
src/modules/unpackfs/main.py
+
1
−
16
View file @
71d08a89
...
...
@@ -263,22 +263,7 @@ class UnpackOperation:
def
run
():
"""
Unsquashes filesystem from given image file.
from globalstorage: rootMountPoint
from job.configuration: the path to where to mount the source image(s) for
copying an ordered list of unpack mappings for image file <-> target dir
relative to rootMountPoint, e.g.:
configuration:
unpack:
- source:
"
/path/to/filesystem.img
"
sourcefs:
"
ext4
"
destination:
""
- source:
"
/path/to/another/filesystem.sqfs
"
sourcefs:
"
squashfs
"
destination:
""
:return:
Unsquash filesystem.
"""
PATH_PROCFS
=
'
/proc/filesystems
'
...
...
This diff is collapsed.
Click to expand it.
src/modules/unpackfs/unpackfs.conf
+
16
−
0
View file @
71d08a89
# Unsquash / unpack a filesystem. Multiple sources are supported, and
# they may be squashed or plain filesystems.
#
# Configuration:
#
# from globalstorage: rootMountPoint
# from job.configuration: the path to where to mount the source image(s)
# for copying an ordered list of unpack mappings for image file <->
# target dir relative to rootMountPoint.
---
unpack
:
# Each list item is unpacked, in order, to the target system.
# Each list item has the following attributes:
# source: path relative to the live / intstalling system to the image
# sourcefs: ext4 or squashfs (may be others if mount supports is)
# destination: path relative to rootMountPoint (so in the target
# system) where this filesystem is unpacked.
-
source
:
"_root-image_"
sourcefs
:
"squashfs"
destination
:
""
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment