Merge pull request #3880 from sumukhballal/update_bottlerocket

Build: Update twoliter to v0.1.0 & SDK to v0.40.0

Makefile.toml

@@ -7,7 +7,7 @@ BUILDSYS_ROOT_DIR = "${CARGO_MAKE_WORKING_DIRECTORY}"
 # For binary installation, this should be a released version (prefixed with a v,
 # for example v0.1.0). For the git sourcecode installation method, this can be
 # any git rev, e.g. a tag, sha, or branch name.
-TWOLITER_VERSION = "v0.0.7"
+TWOLITER_VERSION = "v0.1.0"
 
 # For binary installation, this is the GitHub repository that has binary release artifacts attached
 # to it, for example https://github.com/bottlerocket-os/twoliter. For git sourcecode installation,

Twoliter.toml

@@ -3,10 +3,5 @@ release-version = "1.20.0"
 
 [sdk]
 registry = "public.ecr.aws/bottlerocket"
-name = "bottlerocket-sdk"
-version = "v0.37.0"
-
-[toolchain]
-registry = "public.ecr.aws/bottlerocket"
-name = "bottlerocket-toolchain"
-version = "v0.37.0"
+repo = "bottlerocket-sdk"
+tag = "v0.40.0"

sources/updater/updog/src/main.rs

@@ -67,7 +67,7 @@ struct Config {
     // mode: Option<{Automatic, Managed, Disabled}>
 }
 
-/// Prints a more specific message before exiting through usage().
+/// Prints a more specific message before exiting through `usage()`.
 fn usage_msg<S: AsRef<str>>(msg: S) -> ! {
     eprintln!("{}\n", msg.as_ref());
     usage();
@@ -248,6 +248,7 @@ async fn write_target_to_disk<P: AsRef<Path>>(
         let mut f = std::fs::OpenOptions::new()
             .write(true)
             .create(true)
+            .truncate(true)
             .open(&disk_path)
             .context(error::OpenPartitionSnafu { path: disk_path })?;
         std::io::copy(&mut reader, &mut f).context(error::WriteUpdateSnafu)?;