--- src/replicant.adb.orig	2019-01-30 15:42:12.000000000 +0100
+++ src/replicant.adb	2020-03-04 18:38:10.732872000 +0100
@@ -1170,6 +1170,8 @@
                                 mount_point => location (slave_base, boot));
                   mount_tmpfs (slave_base & root_boot_fw, 100);
                   mount_tmpfs (slave_base & root_kmodules, 200);
+                  --  /boot/opt must already exist in LiveSystem for this to succeed.
+                  mount_tmpfs (slave_base & root_boot_opt, 100);
                end if;
             end;
             declare
@@ -1287,6 +1289,7 @@
                unmount (location (slave_base, usr_lib32));
             end if;
             if AD.Exists (location (dir_system, boot)) then
+               unmount (slave_base & root_boot_opt);
                unmount (slave_base & root_kmodules);
                unmount (slave_base & root_boot_fw);
                unmount (location (slave_base, boot));