From c991568c8b55c159c689ddb1aec475176f9f897e Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Tue, 18 Jul 2023 12:42:57 +1200
Subject: [PATCH] more review suggestions: use .format, add header

---
 subiquity/server/controllers/install.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/subiquity/server/controllers/install.py b/subiquity/server/controllers/install.py
index 04d1a0a0a..e97550622 100644
--- a/subiquity/server/controllers/install.py
+++ b/subiquity/server/controllers/install.py
@@ -37,7 +37,11 @@
     run_in_thread,
     )
 from subiquitycore.context import with_context
-from subiquitycore.file_util import write_file, generate_config_yaml
+from subiquitycore.file_util import (
+    write_file,
+    generate_config_yaml,
+    generate_timestamped_header,
+    )
 from subiquitycore.utils import arun_command, log_process_streams
 
 from subiquity.common.errorreport import ErrorReportKind
@@ -395,8 +399,10 @@ async def create_rp_boot_entry(self, context, rp):
                 ['lsblk', '-n', '-o', 'UUID', rp.path],
                 capture=True)
             uuid = cp.stdout.decode('ascii').strip()
-            conf = grub_reset_conf.replace("#UUID#", uuid)
-            conf = conf.replace("#PARTITION#", str(rp.number))
+            conf = grub_reset_conf.format(
+                HEADER=generate_timestamped_header(),
+                PARTITION=rp.number,
+                UUID=uuid)
             with open(self.tpath('etc/grub.d/99_reset'), 'w') as fp:
                 os.chmod(fp.fileno(), 0o755)
                 fp.write(conf)
@@ -655,12 +661,15 @@ async def stop_unattended_upgrades(self):
 """
 
 grub_reset_conf = """\
-#!/bin/bash -e
+#!/bin/sh
+{HEADER}
+
+set -e
 
 cat << EOF
 menuentry "Restore Ubuntu to factory state" {
-      search --no-floppy --hint '(hd0,#PARTITION#)' --set --fs-uuid #UUID#
-      linux  /casper/vmlinuz uuid=#UUID# nopersistent
+      search --no-floppy --hint '(hd0,{PARTITION})' --set --fs-uuid {UUID}
+      linux  /casper/vmlinuz uuid={UUID} nopersistent
       initrd /casper/initrd
 }
 EOF