#11662 - wic should mount /boot
cover #11662 - wic should mount /boot
Hi,
This patchset adds /boot to the /etc/fstab of root partition, making it mounted on boot. It also fixes reporting and testing issues caused by this change.
The patchset also fixes long standing bug: wic updated fstab inplace in rootfs directory. This causes other tasks working with rootfs directory to produce incorrect results or crash. This is fixed by copying rootfs to the temporary directory before updating fstab.
The following changes since commit 8bb669387c70d5df7ade90287e8e63add1948cf3:
image_types.bbclass: get rid of IMAGE_DEPENDS (2017-06-26 13:57:37 +0300)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ed/test
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/test
Ed Bartosh (7):
wic: copy rootfs directory before changing fstab
wic: use correct rootfs in the report
wic: use absolute paths in rootfs plugin
wic: rootfs: fix rootfs path reporting
wic: rootfs: make copied rootfs unique
wic: add /boot mount point to fstab by default
oe-selftest: wic: fix test_quemu
meta/lib/oeqa/selftest/cases/wic.py | 2 +- scripts/lib/wic/plugins/imager/direct.py | 31 ++++++++++++++++++++----------- scripts/lib/wic/plugins/source/rootfs.py | 16 +++++++--------- 3 files changed, 28 insertions(+), 21 deletions(-)
--
Regards,
Ed
PATCH 1/7 wic: copy rootfs directory before changing fstab
wic updates /etc/fstab on root partition if there are valid mount points in .wks
When wic runs from bitbake this can cause incorrect results or even breakage of other tasks working with rootfs directory in parallel with do_image_wic.
Implemented copying rootfs directory to a temporary location using copyhardlinktree before updating fstab to avoid conflicts with other tasks working with rootfs.
--- scripts/lib/wic/plugins/imager/direct.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
scripts/lib/wic/plugins/imager/direct.py +13 -9
@@ -32,6 +32,8 @@ import uuid from time import strftime +from oe.path import copyhardlinktree + from wic import WicError from wic.filemap import sparse_copy from wic.ksparser import KickStart, KickStartError
@@ -115,12 +117,16 @@ class DirectPlugin(ImagerPlugin): fstab_lines = fstab.readlines() if self._update_fstab(fstab_lines, self.parts): - shutil.copyfile(fstab_path, fstab_path + ".orig") + # copy rootfs dir to workdir to update fstab + # as rootfs can be used by other tasks and can't be modified + new_rootfs = os.path.realpath(os.path.join(self.workdir, "rootfs_copy")) + copyhardlinktree(image_rootfs, new_rootfs) + fstab_path = os.path.join(new_rootfs, 'etc/fstab') with open(fstab_path, "w") as fstab: fstab.writelines(fstab_lines) - return fstab_path + return new_rootfs def _update_fstab(self, fstab_lines, parts): """Assume partition order same as in wks"""
@@ -156,7 +162,10 @@ class DirectPlugin(ImagerPlugin): filesystems from the artifacts directly and combine them into a partitioned image. """ - fstab_path = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR")) + new_rootfs = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR")) + if new_rootfs: + # rootfs was copied to update fstab + self.rootfs_dir['ROOTFS_DIR'] = new_rootfs for part in self.parts: # get rootfs size from bitbake variable if it's not set in .ks file
@@ -172,12 +181,7 @@ class DirectPlugin(ImagerPlugin): if rsize_bb: part.size = int(round(float(rsize_bb))) - try: - self._image.prepare(self) - finally: - if fstab_path: - shutil.move(fstab_path + ".orig", fstab_path) - + self._image.prepare(self) self._image.layout_partitions() self._image.create()
Signature · 1 line
2.1.4
PATCH 2/7 wic: use correct rootfs in the report
In reply to Ed Bartoshwic includs rootfs path in the final report. When fstab needs to be updated wic copies rootfs to a temporary location. This causes path to the copy of rootfs to appear in the final report.
Saved original rootfs path when rootfs is copied to include original path to the report.
--- scripts/lib/wic/plugins/imager/direct.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
scripts/lib/wic/plugins/imager/direct.py +6 -1
@@ -62,6 +62,7 @@ class DirectPlugin(ImagerPlugin): # parse possible 'rootfs=name' items self.rootfs_dir = dict(rdir.split('=') for rdir in rootfs_dir.split(' ')) + self.rootfs_dir_orig = None self.bootimg_dir = bootimg_dir self.kernel_dir = kernel_dir self.native_sysroot = native_sysroot
@@ -165,6 +166,7 @@ class DirectPlugin(ImagerPlugin): new_rootfs = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR")) if new_rootfs: # rootfs was copied to update fstab + self.rootfs_dir_orig = self.rootfs_dir['ROOTFS_DIR'] self.rootfs_dir['ROOTFS_DIR'] = new_rootfs for part in self.parts:
@@ -234,11 +236,14 @@ class DirectPlugin(ImagerPlugin): for part in self.parts: if part.rootfs_dir is None: continue + rootfs_dir = part.rootfs_dir if part.mountpoint == '/': suffix = ':' + if self.rootfs_dir_orig: + rootfs_dir = self.rootfs_dir_orig else: suffix = '["%s"]:' % (part.mountpoint or part.label) - msg += ' ROOTFS_DIR%s%s\n' % (suffix.ljust(20), part.rootfs_dir) + msg += ' ROOTFS_DIR%s%s\n' % (suffix.ljust(20), rootfs_dir) msg += ' BOOTIMG_DIR: %s\n' % self.bootimg_dir msg += ' KERNEL_DIR: %s\n' % self.kernel_dir
Signature · 1 line
2.1.4
PATCH 3/7 wic: use absolute paths in rootfs plugin
In reply to Ed BartoshUsing relative paths can cause copyhardlinktree API to fail as it changes current directory when working. Converted all paths to absolute paths using os.path.realpath.
--- scripts/lib/wic/plugins/source/rootfs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/lib/wic/plugins/source/rootfs.py +2 -2
@@ -48,7 +48,7 @@ class RootfsPlugin(SourcePlugin): @staticmethod def __get_rootfs_dir(rootfs_dir): if os.path.isdir(rootfs_dir): - return rootfs_dir + return os.path.realpath(rootfs_dir) image_rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", rootfs_dir) if not os.path.isdir(image_rootfs_dir):
@@ -56,7 +56,7 @@ class RootfsPlugin(SourcePlugin): "named %s has been found at %s, exiting." % (rootfs_dir, image_rootfs_dir)) - return image_rootfs_dir + return os.path.realpath(image_rootfs_dir) @classmethod def do_prepare_partition(cls, part, source_params, cr, cr_workdir,
Signature · 1 line
2.1.4
PATCH 4/7 wic: rootfs: fix rootfs path reporting
In reply to Ed Bartoshwic gets rootfs paths from partition object property 'rootfs_dir' and shows them in final report.
rootfs plugin sets this property to the temporary path, which causes temporary paths appearing in the report.
Changed the code to prevent storing temporary rootfs path in part.rootfs_dir. This should fix the report.
--- scripts/lib/wic/plugins/source/rootfs.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
scripts/lib/wic/plugins/source/rootfs.py +4 -6
@@ -81,8 +81,9 @@ class RootfsPlugin(SourcePlugin): raise WicError("Couldn't find --rootfs-dir=%s connection or " "it is not a valid path, exiting" % part.rootfs_dir) - real_rootfs_dir = cls.__get_rootfs_dir(rootfs_dir) + part.rootfs_dir = cls.__get_rootfs_dir(rootfs_dir) + new_rootfs = None # Handle excluded paths. if part.exclude_path is not None: # We need a new rootfs directory we can delete files from. Copy to
@@ -92,9 +93,7 @@ class RootfsPlugin(SourcePlugin): if os.path.lexists(new_rootfs): shutil.rmtree(os.path.join(new_rootfs)) - copyhardlinktree(real_rootfs_dir, new_rootfs) - - real_rootfs_dir = new_rootfs + copyhardlinktree(part.rootfs_dir, new_rootfs) for orig_path in part.exclude_path: path = orig_path
@@ -123,6 +122,5 @@ class RootfsPlugin(SourcePlugin): # Delete whole directory. shutil.rmtree(full_path) - part.rootfs_dir = real_rootfs_dir part.prepare_rootfs(cr_workdir, oe_builddir, - real_rootfs_dir, native_sysroot) + new_rootfs or part.rootfs_dir, native_sysroot)
Signature · 1 line
2.1.4
PATCH 5/7 wic: rootfs: make copied rootfs unique
In reply to Ed BartoshUsed unique suffix (line number from .wks file) for the copied rootfs directory to avoid possible conflicts.
--- scripts/lib/wic/plugins/source/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/wic/plugins/source/rootfs.py +1 -1
@@ -88,7 +88,7 @@ class RootfsPlugin(SourcePlugin): if part.exclude_path is not None: # We need a new rootfs directory we can delete files from. Copy to # workdir. - new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs")) + new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs%d" % part.lineno)) if os.path.lexists(new_rootfs): shutil.rmtree(os.path.join(new_rootfs))
Signature · 1 line
2.1.4
Re: [PATCH 5/7] wic: rootfs: make copied rootfs unique
Can you squash stuff like this into the first patch, the history doesn't need to see your working.
Also, does the hardlink copy get cleaned up?
Ross
Quoted 34 lines · Ed Bartosh
Used unique suffix (line number from .wks file) for the copied rootfs directory to avoid possible conflicts.
Signed-off-by Ed Bartosh <[email protected]>--- scripts/lib/wic/plugins/source/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)scripts/lib/wic/plugins/source/rootfs.py +0
-0@@ -88,7 +88,7 @@ class RootfsPlugin(SourcePlugin): if part.exclude_path is not None: # We need a new rootfs directory we can delete files from.Copy to
# workdir. - new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs")) + new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs%d" % part.lineno))if
os.path.lexists(new_rootfs):
shutil.rmtree(os.path.join(new_rootfs))
--
2.1.4--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 5/7] wic: rootfs: make copied rootfs unique
Quoted 3 lines · Ross
Can you squash stuff like this into the first patch, the history doesn't need to see your working.
This commit doesn't fit to any other from my point of view. It's just a fix for rootfs plugin.
I'll try to squash other commits.
Quoted 2 lines
Also, does the hardlink copy get cleaned up?
Yes, it does. It's created in the temporary directory, which is removed after image is ready.
Quoted 38 lines
Ross
Quoted 34 lines · Ed Bartosh
Used unique suffix (line number from .wks file) for the copied rootfs directory to avoid possible conflicts.
Signed-off-by Ed Bartosh <[email protected]>--- scripts/lib/wic/plugins/source/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)scripts/lib/wic/plugins/source/rootfs.py +0
-0@@ -88,7 +88,7 @@ class RootfsPlugin(SourcePlugin): if part.exclude_path is not None: # We need a new rootfs directory we can delete files from.Copy to
# workdir. - new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs")) + new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs%d" % part.lineno))if
os.path.lexists(new_rootfs):
shutil.rmtree(os.path.join(new_rootfs))
--
2.1.4--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 3 lines
-- Regards, Ed
PATCH 6/7 wic: add /boot mount point to fstab by default
In reply to Ed Bartoshwic avoided adding /boot to fstab for no reason.
This exception was hardcoded in the wic code.
There is no need for this as mountpoint in .wks file is an optional field. It can be used only if user wants to have partitions automatically mounted on system boot.
[YOCTO #11662]
--- scripts/lib/wic/plugins/imager/direct.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/wic/plugins/imager/direct.py +1 -1
@@ -134,7 +134,7 @@ class DirectPlugin(ImagerPlugin): updated = False for part in parts: if not part.realnum or not part.mountpoint \ - or part.mountpoint in ("/", "/boot"): + or part.mountpoint == "/": continue # mmc device partitions are named mmcblk0p1, mmcblk0p2..
Signature · 1 line
2.1.4
PATCH 7/7 oe-selftest: wic: fix test_quemu
In reply to Ed BartoshThis test case boots the image in qemu and checks for mounted partitions. As /boot is mounted automatically the test case fails. Fixed this by adding /boot to the list of mounted partitions.
--- meta/lib/oeqa/selftest/cases/wic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/wic.py +1 -1
@@ -622,7 +622,7 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --r cmd = "mount |grep '^/dev/' | cut -f1,3 -d ' '" status, output = qemu.run_serial(cmd) self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) - self.assertEqual(output, '/dev/root /\r\n/dev/sda3 /mnt') + self.assertEqual(output, '/dev/root /\r\n/dev/sda1 /boot\r\n/dev/sda3 /mnt') @only_for_arch(['i586', 'i686', 'x86_64']) @OETestID(1852)
Signature · 1 line
2.1.4