diff --git a/cli/src/config.rs b/cli/src/config.rs index ac3ac5e..407d7e2 100644 --- a/cli/src/config.rs +++ b/cli/src/config.rs @@ -43,7 +43,11 @@ pub fn config_workspace(args: &ArgMatches) -> Result<()> { let mut config = ws.config(); let old_config = config.clone(); - patch_workspace_config(args, &mut config)?; + if args.args_present() { + patch_workspace_config(args, &mut config)?; + } else { + ask_for_config(&mut config)?; + } if config != old_config { info!("Applying new workspace configuration ..."); @@ -55,6 +59,7 @@ pub fn config_workspace(args: &ArgMatches) -> Result<()> { } else { info!("Nothing has been changed"); } + ws.set_config(config)?; Ok(()) } diff --git a/src/machine.rs b/src/machine.rs index abe7cf4..287934d 100644 --- a/src/machine.rs +++ b/src/machine.rs @@ -256,7 +256,7 @@ impl Machine { } const APT_UPDATE_SCRIPT: &str = r#"set -euo pipefail;export DEBIAN_FRONTEND=noninteractive;apt-get update -y --allow-releaseinfo-change && apt-get -y -o Dpkg::Options::="--force-confnew" full-upgrade --autoremove --purge && apt autoclean"#; -const OMA_UPDATE_SCRIPT: &str = r#"set -euo pipefail;oma upgrade -y --force-confnew --no-progress --force-unsafe-io && oma autoremove -y --remove-config && oma clean"#; +const OMA_UPDATE_SCRIPT: &str = r#"set -euo pipefail;oma upgrade -y --force-confnew --no-progress --force-unsafe-io && oma autoremove --no-progress -y --remove-config && oma clean --no-progress"#; fn wait_for_machine(mut child: Child, ns_name: &str) -> Result<()> { for i in 0..10 {