Merge lp:~emanuele-aina/linaro-image-tools/grub-load-rootfs-by-uuid into lp:linaro-image-tools/11.11

[Emanuele Aina]

Currently the I386Config board definition sets the `root=LABEL=rootfs' parameter for the kernel to be booted and, given that populate_rootfs() uses the UUID to populate /etc/fstab, this can lead to some inconsistencies.

This branch updates the _make_boot_files_*() functions to accept a 'rootfs_uuid' parameter and on i386 uses it to generate a "root=UUID=%s" kernel command line argument.

Argument passing between the bootfs/rootfs stages is a bit flaky, given the need to update so many call sites. Coalescing all the function parameters in a BuildConfig object would reduce the patch to three lines and make future modifications easier.

[Milo Casagrande (milo)]

Hi Emanuele,

thanks for working on this!
I was looking at the patch, and unfortunately there is a small conflict when I merge it with trunk. Conflict is rather trivia to fix, but the are at least 13 tests failing now.

Can you please update the patch and take a look at the errors?
Thanks.

review: Needs Fixing

Unmerged revisions

534. By Emanuele Aina on 2012-07-05

Point the i386 kernel to its rootfs by UUID

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2012-06-13 14:41:42 +0000
+++ linaro_image_tools/media_create/boards.py	2012-07-05 13:39:21 +0000
@@ -668,11 +668,11 @@
 
         if cls.hwpack_format == HardwarepackHandler.FORMAT_1:
             cls._make_boot_files(
-                boot_env, chroot_dir, boot_dir,
+                rootfs_uuid, boot_env, chroot_dir, boot_dir,
                 boot_device_or_file, k_img_data, i_img_data, d_img_data)
         else:
             cls._make_boot_files_v2(
-                boot_env, chroot_dir, boot_dir,
+                rootfs_uuid, boot_env, chroot_dir, boot_dir,
                 boot_device_or_file, k_img_data, i_img_data, d_img_data)
 
     @classmethod
@@ -696,7 +696,7 @@
                              cls.SAMSUNG_V310_BL2_LEN * SECTOR_SIZE)
 
     @classmethod
-    def _make_boot_files_v2(cls, boot_env, chroot_dir, boot_dir,
+    def _make_boot_files_v2(cls, rootfs_uuid, boot_env, chroot_dir, boot_dir,
                          boot_device_or_file, k_img_data, i_img_data,
                          d_img_data):
         with cls.hardwarepack_handler:
@@ -747,7 +747,7 @@
                          cls.SAMSUNG_V310_ENV_START)
 
     @classmethod
-    def _make_boot_files(cls, boot_env, chroot_dir, boot_dir,
+    def _make_boot_files(cls, rootfs_uuid, boot_env, chroot_dir, boot_dir,
                          boot_device_or_file, k_img_data, i_img_data,
                          d_img_data):
         """Make the necessary boot files for this board.
@@ -916,7 +916,7 @@
             rootfs_uuid, boot_dir, boot_device_or_file)
 
     @classmethod
-    def _make_boot_files(cls, boot_env, chroot_dir, boot_dir,
+    def _make_boot_files(cls, rootfs_uuid, boot_env, chroot_dir, boot_dir,
                          boot_device_or_file, k_img_data, i_img_data,
                          d_img_data):
         # XXX: delete this method when hwpacks V1 can die
@@ -983,7 +983,7 @@
     dtb_name = 'isee-igep-v2.dtb'
 
     @classmethod
-    def _make_boot_files(cls, boot_env, chroot_dir, boot_dir,
+    def _make_boot_files(cls, rootfs_uuid, boot_env, chroot_dir, boot_dir,
                          boot_device_or_file, k_img_data, i_img_data,
                          d_img_data):
         # XXX: delete this method when hwpacks V1 can die
@@ -1021,7 +1021,7 @@
         return cls._extra_serial_opts % cls.serial_tty
 
     @classmethod
-    def _make_boot_files(cls, boot_env, chroot_dir, boot_dir,
+    def _make_boot_files(cls, rootfs_uuid, boot_env, chroot_dir, boot_dir,
                          boot_device_or_file, k_img_data, i_img_data,
                          d_img_data):
         # XXX: delete this method when hwpacks V1 can die
@@ -1040,7 +1040,7 @@
        the SnowballConfigImage configuration.'''
 
     @classmethod
-    def _make_boot_files(cls, boot_env, chroot_dir, boot_dir,
+    def _make_boot_files(cls, rootfs_uuid, boot_env, chroot_dir, boot_dir,
                          boot_device_or_file, k_img_data, i_img_data,
                          d_img_data):
         # XXX: delete this method when hwpacks V1 can die
@@ -1096,7 +1096,7 @@
         loader_start, loader_len, boot_start, boot_len, root_start)
 
     @classmethod
-    def _make_boot_files(cls, boot_env, chroot_dir, boot_dir,
+    def _make_boot_files(cls, rootfs_uuid, boot_env, chroot_dir, boot_dir,
                          boot_device_or_file, k_img_data, i_img_data,
                          d_img_data):
         # XXX: delete this method when hwpacks V1 can die
@@ -1271,7 +1271,7 @@
             loader_start, loader_len, boot_start, boot_len, root_start)
 
     @classmethod
-    def _make_boot_files(cls, boot_env, chroot_dir, boot_dir,
+    def _make_boot_files(cls, rootfs_uuid, boot_env, chroot_dir, boot_dir,
                          boot_device_or_file, k_img_data, i_img_data,
                          d_img_data):
         # XXX: delete this method when hwpacks V1 can die
@@ -1349,7 +1349,7 @@
         return cls._extra_serial_opts % cls.serial_tty
 
     @classmethod
-    def _make_boot_files(cls, boot_env, chroot_dir, boot_dir,
+    def _make_boot_files(cls, rootfs_uuid, boot_env, chroot_dir, boot_dir,
                          boot_device_or_file, k_img_data, i_img_data,
                          d_img_data):
         make_uImage(cls.load_addr, k_img_data, boot_dir)
@@ -1375,7 +1375,7 @@
         return ""
 
     @classmethod
-    def _make_boot_files_v2(cls, boot_env, chroot_dir, boot_dir,
+    def _make_boot_files_v2(cls, rootfs_uuid, boot_env, chroot_dir, boot_dir,
                          boot_device_or_file, k_img_data, i_img_data,
                          d_img_data):
         output_dir = os.path.dirname(boot_device_or_file)
@@ -1418,7 +1418,7 @@
             loaders_start, loaders_len, boot_start, boot_len, root_start)
 
     @classmethod
-    def _make_boot_files(cls, boot_env, chroot_dir, boot_dir,
+    def _make_boot_files(cls, rootfs_uuid, boot_env, chroot_dir, boot_dir,
                          boot_device_or_file, k_img_data, i_img_data,
                          d_img_data):
         # XXX: delete this method when hwpacks V1 can die
@@ -1543,7 +1543,7 @@
     set timeout=3
     set default='0'
     menuentry 'core' {
-            linux /%s root=LABEL=rootfs ro %s
+            linux /%s root=UUID=%s ro %s
             initrd /%s
     }"""
 
@@ -1556,7 +1556,7 @@
         return cls._extra_serial_opts % cls.serial_tty
 
     @classmethod
-    def _make_boot_files(cls, boot_env, chroot_dir, boot_dir,
+    def _make_boot_files(cls, rootfs_uuid, boot_env, chroot_dir, boot_dir,
                          boot_device_or_file, k_img_data, i_img_data,
                          d_img_data):
         # copy image and init into boot partition
@@ -1575,7 +1575,7 @@
 
         # generate loader config file
         loader_config = cls.BOOTLOADER_CFG % (os.path.basename(k_img_data),
-            cls.extra_serial_opts, os.path.basename(i_img_data))
+            rootfs_uuid, cls.extra_serial_opts, os.path.basename(i_img_data))
 
         _, tmpfile = tempfile.mkstemp()
         atexit.register(os.unlink, tmpfile)
@@ -1586,11 +1586,11 @@
             cls.BOOTLOADER_CFG_FILE)], as_root=True).wait()
 
     @classmethod
-    def _make_boot_files_v2(cls, boot_env, chroot_dir, boot_dir,
+    def _make_boot_files_v2(cls, rootfs_uuid, boot_env, chroot_dir, boot_dir,
                             boot_device_or_file, k_img_data, i_img_data,
                             d_img_data):
         # reuse hwpack v1 function
-        cls._make_boot_files(boot_env, chroot_dir, boot_dir,
+        cls._make_boot_files(rootfs_uuid, boot_env, chroot_dir, boot_dir,
                              boot_device_or_file, k_img_data, i_img_data,
                              d_img_data)
 
 
=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2012-07-04 15:30:34 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2012-07-05 13:39:21 +0000
@@ -905,7 +905,8 @@
         boot_env = board_configs['snowball_emmc']._get_boot_env(
             is_live=False, is_lowmem=False, consoles=[],
             rootfs_uuid="test_boot_env_uuid", d_img_data=None)
-        boards.SnowballEmmcConfig._make_boot_files(boot_env, self.tempdir,
+        boards.SnowballEmmcConfig._make_boot_files("test_boot_env_uuid",
+            boot_env, self.tempdir,
             self.temp_bootdir_path, 'boot_device_or_file', k_img_file,
             i_img_file, None)
         expected = [