Merge pull request #1120 from omertuc/promptt

reinstall: Move the no users prompt

system-reinstall-bootc/src/main.rs

@@ -11,10 +11,6 @@ pub(crate) mod users;
 
 const ROOT_KEY_MOUNT_POINT: &str = "/bootc_authorized_ssh_keys/root";
 
-const NO_SSH_PROMPT: &str = "None of the users on this system found have authorized SSH keys, if
-your image doesn't use cloud-init or other means to set up users, you may not be able to log in
-after reinstalling. Do you want to continue?";
-
 fn run() -> Result<()> {
     bootc_utils::initialize_tracing();
     tracing::trace!("starting {}", env!("CARGO_PKG_NAME"));
@@ -26,7 +22,7 @@ fn run() -> Result<()> {
 
     let root_key = &prompt::get_root_key()?;
 
-    if root_key.is_none() && !prompt::ask_yes_no(NO_SSH_PROMPT, false)? {
+    if root_key.is_none() {
         return Ok(());
     }
 

system-reinstall-bootc/src/prompt.rs

@@ -1,6 +1,13 @@
-use crate::users::{get_all_users_keys, UserKeys};
+use crate::{
+    prompt,
+    users::{get_all_users_keys, UserKeys},
+};
 use anyhow::{ensure, Context, Result};
 
+const NO_SSH_PROMPT: &str = "None of the users on this system found have authorized SSH keys, \
+    if your image doesn't use cloud-init or other means to set up users, \
+    you may not be able to log in after reinstalling. Do you want to continue?";
+
 fn prompt_single_user(user: &crate::users::UserKeys) -> Result<Vec<&crate::users::UserKeys>> {
     let prompt = format!(
         "Found only one user ({}) with {} SSH authorized keys. Would you like to import it and its keys to the system?",
@@ -61,6 +68,11 @@ pub(crate) fn ask_yes_no(prompt: &str, default: bool) -> Result<bool> {
 pub(crate) fn get_root_key() -> Result<Option<UserKeys>> {
     let users = get_all_users_keys()?;
     if users.is_empty() {
+        ensure!(
+            prompt::ask_yes_no(NO_SSH_PROMPT, false)?,
+            "cancelled by user"
+        );
+
         return Ok(None);
     }