From 8799604266ffaf1e6ce0c6c76b9ba212241e228d Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Tue, 20 Aug 2019 13:56:15 -0400 Subject: [PATCH] Change name of boot entry file from citadel.conf to boot.conf This matches the naming convention of the kernel update installer. --- citadel-tool/src/install/installer.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/citadel-tool/src/install/installer.rs b/citadel-tool/src/install/installer.rs index 41e1b88..a5fcb2e 100644 --- a/citadel-tool/src/install/installer.rs +++ b/citadel-tool/src/install/installer.rs @@ -87,7 +87,7 @@ const FINISH_COMMANDS: &[&str] = &[ ]; const LOADER_CONF: &str = "\ -default citadel +default boot timeout 5 "; @@ -290,8 +290,8 @@ impl Installer { self.info("Writing /boot/loader/loader.conf")?; fs::write(format!("{}/loader/loader.conf", INSTALL_MOUNT), LOADER_CONF)?; - self.info("Writing /boot/entries/citadel.conf")?; - fs::write(format!("{}/loader/entries/citadel.conf", INSTALL_MOUNT), + self.info("Writing /boot/entries/boot.conf")?; + fs::write(format!("{}/loader/entries/boot.conf", INSTALL_MOUNT), BOOT_CONF.replace("$KERNEL_CMDLINE", KERNEL_CMDLINE))?; self.copy_artifact("bzImage", INSTALL_MOUNT)?;