1
diff --git a/curtin/util.py b/curtin/util.py
2
index e25402a..eb2228f 100644
3
--- a/curtin/util.py
4
+++ b/curtin/util.py
5
@@ -916,8 +916,14 @@ def sanitize_source(source):
6
916
            return {'type': i, 'uri': source[len(prefix):]}
916
            return {'type': i, 'uri': source[len(prefix):]}
7
917
917
8
918
    # translate squashfs: to fsimage type.
918
    # translate squashfs: to fsimage type.
11
919
    if source.startswith("squashfs:"):
919
    if source.startswith("squashfs://"):
12
920
        return {'type': 'fsimage', 'uri': source[len("squashfs:")]}
920
        return {'type': 'fsimage', 'uri': source[len("squashfs://"):]}
13
921
14
922
    elif source.startswith("squashfs:"):
15
923
        LOG.warning("The squashfs: prefix is deprecated and"
16
924
                    "will be removed in a future release."
17
925
                    "Please use squashfs:// instead.")
18
926
        return {'type': 'fsimage', 'uri': source[len("squashfs:"):]}
19
921
927
20
922
    if source.endswith("squashfs") or source.endswith("squash"):
928
    if source.endswith("squashfs") or source.endswith("squash"):
21
923
        return {'type': 'fsimage', 'uri': source}
929
        return {'type': 'fsimage', 'uri': source}
22
diff --git a/doc/topics/config.rst b/doc/topics/config.rst
23
index b7cca43..7aea848 100644
24
--- a/doc/topics/config.rst
25
+++ b/doc/topics/config.rst
26
@@ -555,6 +555,7 @@ configures the method used to copy the image to the target system.
27
555
- **dd-**:  Use ``dd`` command to write image to target.
555
- **dd-**:  Use ``dd`` command to write image to target.
28
556
- **cp://**: Use ``rsync`` command to copy source directory to target.
556
- **cp://**: Use ``rsync`` command to copy source directory to target.
29
557
- **file://**: Use ``tar`` command to extract source to target.
557
- **file://**: Use ``tar`` command to extract source to target.
30
558
- **squashfs://**: Mount squashfs image and copy contents to target.
31
558
- **http[s]://**: Use ``wget | tar`` commands to extract source to target.
559
- **http[s]://**: Use ``wget | tar`` commands to extract source to target.
32
559
- **fsimage://** mount filesystem image and copy contents to target.
560
- **fsimage://** mount filesystem image and copy contents to target.
33
560
  Local file or url are supported. Filesystem can be any filesystem type
561
  Local file or url are supported. Filesystem can be any filesystem type
34
@@ -649,6 +650,9 @@ This results in Curtin downloading the following URLs::
35
649
  sources: 
650
  sources: 
36
650
    - cp:///
651
    - cp:///
37
651
652
38
653
**Example squashfs from NFS mount**::
39
654
  sources:
40
655
    - squashfs:///media/filesystem.squashfs
41
652
656
42
653
**Example Copy from local tarball**::
657
**Example Copy from local tarball**::
43
654
658
44
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
45
index 7f05ced..80bb85f 100644
46
--- a/tests/unittests/test_util.py
47
+++ b/tests/unittests/test_util.py
48
@@ -1102,6 +1102,7 @@ class TestSanitizeSource(CiTestCase):
49
1102
                 'dd-bz2', 'dd-gz', 'dd-xz', 'dd-raw', 'fsimage',
1102
                 'dd-bz2', 'dd-gz', 'dd-xz', 'dd-raw', 'fsimage',
50
1103
                 'fsimage-layered']
1103
                 'fsimage-layered']
51
1104
    source_url = 'http://curtin.io/root-fs.foo'
1104
    source_url = 'http://curtin.io/root-fs.foo'
52
1105
    squashfs_source_path = "/media/filesystem.squashfs"
53
1105
1106
54
1106
    def test_supported_sources(self):
1107
    def test_supported_sources(self):
55
1107
        """ Verify supported sources types return expected dictionary. """
1108
        """ Verify supported sources types return expected dictionary. """
56
@@ -1112,9 +1113,11 @@ class TestSanitizeSource(CiTestCase):
57
1112
1113
58
1113
    def test_supported_squashfs_source_type(self):
1114
    def test_supported_squashfs_source_type(self):
59
1114
        """ Verify squashfs: prefix returns type=fsimage and correct uri."""
1115
        """ Verify squashfs: prefix returns type=fsimage and correct uri."""
63
1115
        stype = 'fsimage'
1116
        stype = 'squashfs'
64
1116
        expected = {'type': stype, 'uri': self.source_url}
1117
        target_stype = "fsimage"
65
1117
        result = util.sanitize_source("%s:%s" % (stype, self.source_url))
1118
        expected = {'type': target_stype, 'uri': self.squashfs_source_path}
66
1119
        result = util.sanitize_source("%s://%s" %
67
1120
                                      (stype, self.squashfs_source_path))
68
1118
        self.assertEqual(expected, result)
1121
        self.assertEqual(expected, result)
69
1119
1122
70
1120
    def test_supported_squashfs_suffix(self):
1123
    def test_supported_squashfs_suffix(self):
Reviewer	Review Type	Date Requested	Status
Ryan Harper (community)		2019-11-04	Approve on 2019-11-08
Server Team CI bot	continuous-integration		Approve on 2019-11-08
Review via email: mp+375109@code.launchpad.net