Skip to content

Commit

Permalink
Rewrite livefs
Browse files Browse the repository at this point in the history
- Based on `ostree admin unlock --transient`
- Only touch `/usr` (for now)
- Written in Rust
- Based on incremental updates
  • Loading branch information
cgwalters committed Nov 11, 2020
1 parent f069cd2 commit 7f2bec7
Show file tree
Hide file tree
Showing 21 changed files with 638 additions and 1,216 deletions.
4 changes: 2 additions & 2 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ tempfile = "3.1.0"
clap = "2.33.3"
structopt = "0.3.20"
openat = "0.1.19"
openat-ext = "^0.1.8"
openat-ext = "^0.1.9"
curl = "0.4.34"
rayon = "1.5.0"
c_utf8 = "0.1.0"
Expand All @@ -35,7 +35,6 @@ subprocess = "0.2.6"
chrono = { version = "0.4.19", features = ["serde"] }
libdnf-sys = { path = "libdnf-sys", version = "0.1.0" }


[lib]
name = "rpmostree_rust"
path = "src/lib.rs"
Expand Down
10 changes: 0 additions & 10 deletions rust/src/includes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ NOTICE: The C header definitions are canonical, please update those first
then synchronize the entries here.
!*/

use crate::syscore::ffi::RpmOstreeOrigin;
use libdnf_sys::DnfPackage;

// From `libpriv/rpmostree-rpm-util.h`.
Expand All @@ -19,12 +18,3 @@ extern "C" {
gerror: *mut *mut glib_sys::GError,
) -> libc::c_int;
}

// From `libpriv/rpmostree-origin.h`.
extern "C" {
pub(crate) fn rpmostree_origin_get_live_state(
origin: *mut RpmOstreeOrigin,
out_inprogress: *mut *mut libc::c_char,
out_livereplaced: *mut *mut libc::c_char,
);
}
6 changes: 4 additions & 2 deletions rust/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ mod initramfs;
pub use self::initramfs::ffi::*;
mod lockfile;
pub use self::lockfile::*;
mod livefs;
pub use self::livefs::*;
mod ostree_diff;
mod ostree_utils;
mod progress;
pub use self::progress::*;
mod syscore;
pub use self::syscore::ffi::*;
mod testutils;
pub use self::testutils::*;
mod treefile;
Expand Down
Loading

0 comments on commit 7f2bec7

Please sign in to comment.