Merge pull request #21 from AOSC-Dev/use-oma-to-update-os

feat: use oma to update-os
AOSC-Dev · Jul 18, 2024 · 97626ee · 97626ee
2 parents 0f5162f + 62fecdb
commit 97626ee
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/actions/container.rs b/src/actions/container.rs
@@ -11,15 +11,15 @@ use std::{
 };
 
 use crate::{
-    actions::ensure_host_sanity,
+    actions::{ensure_host_sanity, OMA_UPDATE_SCRIPT},
     common::*,
     config, error, info,
     machine::{self, get_container_ns_name, inspect_instance, spawn_container},
     network::download_file_progress,
     overlayfs, warn,
 };
 
-use super::{for_each_instance, UPDATE_SCRIPT};
+use super::{for_each_instance, APT_UPDATE_SCRIPT};
 
 /// Get the branch name of the workspace TREE repository
 #[inline]
@@ -380,9 +380,12 @@ pub fn update_os() -> Result<()> {
     info!("Updating base OS...");
     let instance = format!("update-{:x}", random::<u32>());
     add_instance(&instance)?;
-    let status = run_in_container(&instance, &["/bin/bash", "-ec", UPDATE_SCRIPT])?;
+    let mut status = run_in_container(&instance, &["/bin/bash", "-ec", OMA_UPDATE_SCRIPT])?;
     if status != 0 {
-        return Err(anyhow!("Failed to update OS: {}", status));
+        status = run_in_container(&instance, &["/bin/bash", "-ec", APT_UPDATE_SCRIPT])?;
+        if status != 0 {
+            return Err(anyhow!("Failed to update OS: {}", status));
+        }
     }
     commit_container(&instance)?;
     remove_instance(&instance)?;

diff --git a/src/actions/mod.rs b/src/actions/mod.rs
@@ -18,7 +18,8 @@ const DEFAULT_MOUNTS: &[(&str, &str)] = &[
     ("SRCS", "/var/cache/acbs/tarballs"),
     ("CACHE", "/var/cache/apt/archives"),
 ];
-const UPDATE_SCRIPT: &str = r#"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 APT_UPDATE_SCRIPT: &str = r#"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#"oma upgrade -y --force-confnew --no-progress && oma autoremove --remove-config && oma clean"#;
 
 type MountOptions = (Vec<String>, Vec<(String, &'static str)>);
 /// Ensure that the directories exist and mounted

diff --git a/src/actions/packaging.rs b/src/actions/packaging.rs
@@ -12,11 +12,11 @@ use std::{
 };
 use walkdir::WalkDir;
 
-use crate::{common::create_spinner, config, error, info, repo, warn};
+use crate::{actions::OMA_UPDATE_SCRIPT, common::create_spinner, config, error, info, repo, warn};
 
 use super::{
     container::{get_output_directory, mount_fs, rollback_container, run_in_container},
-    UPDATE_SCRIPT,
+    APT_UPDATE_SCRIPT,
 };
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
@@ -177,8 +177,13 @@ fn package_build_inner<P: AsRef<Path>>(
         info!("Refreshing local repository...");
         repo::init_repo(root.as_ref(), Path::new(instance))?;
         let mut status = -1;
+        let mut oma = true;
         for i in 1..=5 {
-            status = run_in_container(instance, &["/bin/bash", "-ec", UPDATE_SCRIPT]).unwrap_or(-1);
+            status = if oma {
+                run_in_container(instance, &["/bin/bash", "-ec", OMA_UPDATE_SCRIPT]).unwrap_or(-1)
+            } else {
+                run_in_container(instance, &["/bin/bash", "-ec", APT_UPDATE_SCRIPT]).unwrap_or(-1)
+            };
             if status == 0 {
                 break;
             } else {
@@ -187,6 +192,7 @@ fn package_build_inner<P: AsRef<Path>>(
                     "Failed to update the OS, will retry in {} seconds ...",
                     interval
                 );
+                oma = false;
                 sleep(Duration::from_secs(interval));
             }
         }