[gnome-continuous/wip/hwtest: 10/11] Hack: always install the bootloader for the minimal image



commit 3322b65474dc1a6b252028cba70164fdaeafda3f
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Thu Jun 5 10:04:36 2014 -0400

    Hack: always install the bootloader for the minimal image
    
    We need to boot the minimal image once read-write so that the right
    subdirs of /var are there when booted read-only. Always installing the
    bootloader accomplishes this.

 src/js/tasks/task-builddisks.js |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/src/js/tasks/task-builddisks.js b/src/js/tasks/task-builddisks.js
index 931542b..553737b 100644
--- a/src/js/tasks/task-builddisks.js
+++ b/src/js/tasks/task-builddisks.js
@@ -123,8 +123,13 @@ const TaskBuildDisks = new Lang.Class({
             } finally {
                 gfmnt.umount(cancellable);
             }
-            // Assume previous disks have successfully installed a bootloader
-            if (!doCloneDisk) {
+
+            // Assume previous disks have successfully installed a bootloader. We, however,
+            // always install a bootloader for minimal, since we want it to be bootable
+            // read-only and bootloader installation, by booting the disk read-write, has
+            // the positive side-effect of letting systemd-tempfiles run and create the
+            // necessary directories in /var that we depend on.
+            if (!doCloneDisk || targetName.endsWith("-minimal")) {
                 LibQA.bootloaderInstall(diskPath, Gio.File.new_for_path('.'), osname, cancellable);
                 print("Bootloader installation complete");
             }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]