Change name of boot entry file from citadel.conf to boot.conf

This matches the naming convention of the kernel update installer.
This commit is contained in:
Bruce Leidl 2019-08-20 13:56:15 -04:00
parent ca521ef053
commit 8799604266

View File

@ -87,7 +87,7 @@ const FINISH_COMMANDS: &[&str] = &[
]; ];
const LOADER_CONF: &str = "\ const LOADER_CONF: &str = "\
default citadel default boot
timeout 5 timeout 5
"; ";
@ -290,8 +290,8 @@ impl Installer {
self.info("Writing /boot/loader/loader.conf")?; self.info("Writing /boot/loader/loader.conf")?;
fs::write(format!("{}/loader/loader.conf", INSTALL_MOUNT), LOADER_CONF)?; fs::write(format!("{}/loader/loader.conf", INSTALL_MOUNT), LOADER_CONF)?;
self.info("Writing /boot/entries/citadel.conf")?; self.info("Writing /boot/entries/boot.conf")?;
fs::write(format!("{}/loader/entries/citadel.conf", INSTALL_MOUNT), fs::write(format!("{}/loader/entries/boot.conf", INSTALL_MOUNT),
BOOT_CONF.replace("$KERNEL_CMDLINE", KERNEL_CMDLINE))?; BOOT_CONF.replace("$KERNEL_CMDLINE", KERNEL_CMDLINE))?;
self.copy_artifact("bzImage", INSTALL_MOUNT)?; self.copy_artifact("bzImage", INSTALL_MOUNT)?;