diff options
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/wic/help.py | 7 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/imager/direct.py | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py index 83bd86e7c5..bd9c62e2e8 100644 --- a/scripts/lib/wic/help.py +++ b/scripts/lib/wic/help.py | |||
@@ -155,7 +155,7 @@ SYNOPSIS | |||
155 | [-e | --image-name] [-s, --skip-build-check] [-D, --debug] | 155 | [-e | --image-name] [-s, --skip-build-check] [-D, --debug] |
156 | [-r, --rootfs-dir] [-b, --bootimg-dir] | 156 | [-r, --rootfs-dir] [-b, --bootimg-dir] |
157 | [-k, --kernel-dir] [-n, --native-sysroot] [-f, --build-rootfs] | 157 | [-k, --kernel-dir] [-n, --native-sysroot] [-f, --build-rootfs] |
158 | [-c, --compress-with] [-m, --bmap] | 158 | [-c, --compress-with] [-m, --bmap] [--no-fstab-update] |
159 | 159 | ||
160 | DESCRIPTION | 160 | DESCRIPTION |
161 | This command creates an OpenEmbedded image based on the 'OE | 161 | This command creates an OpenEmbedded image based on the 'OE |
@@ -227,6 +227,11 @@ DESCRIPTION | |||
227 | 227 | ||
228 | The -m option is used to produce .bmap file for the image. This file | 228 | The -m option is used to produce .bmap file for the image. This file |
229 | can be used to flash image using bmaptool utility. | 229 | can be used to flash image using bmaptool utility. |
230 | |||
231 | The --no-fstab-update option is used to doesn't change fstab file. When | ||
232 | using this option the final fstab file will be same that in rootfs and | ||
233 | wic doesn't update file, e.g adding a new mount point. User can control | ||
234 | the fstab file content in base-files recipe. | ||
230 | """ | 235 | """ |
231 | 236 | ||
232 | wic_list_usage = """ | 237 | wic_list_usage = """ |
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index a6abc3d09e..60317eed22 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py | |||
@@ -71,6 +71,7 @@ class DirectPlugin(ImagerPlugin): | |||
71 | self.outdir = options.outdir | 71 | self.outdir = options.outdir |
72 | self.compressor = options.compressor | 72 | self.compressor = options.compressor |
73 | self.bmap = options.bmap | 73 | self.bmap = options.bmap |
74 | self.no_fstab_update = options.no_fstab_update | ||
74 | 75 | ||
75 | self.name = "%s-%s" % (os.path.splitext(os.path.basename(wks_file))[0], | 76 | self.name = "%s-%s" % (os.path.splitext(os.path.basename(wks_file))[0], |
76 | strftime("%Y%m%d%H%M")) | 77 | strftime("%Y%m%d%H%M")) |
@@ -165,7 +166,10 @@ class DirectPlugin(ImagerPlugin): | |||
165 | filesystems from the artifacts directly and combine them into | 166 | filesystems from the artifacts directly and combine them into |
166 | a partitioned image. | 167 | a partitioned image. |
167 | """ | 168 | """ |
168 | new_rootfs = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR")) | 169 | if self.no_fstab_update: |
170 | new_rootfs = None | ||
171 | else: | ||
172 | new_rootfs = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR")) | ||
169 | if new_rootfs: | 173 | if new_rootfs: |
170 | # rootfs was copied to update fstab | 174 | # rootfs was copied to update fstab |
171 | self.rootfs_dir['ROOTFS_DIR'] = new_rootfs | 175 | self.rootfs_dir['ROOTFS_DIR'] = new_rootfs |