packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2563 from cgwalters/tmpfiles-run 

tmpfiles: Create `/run/ostree`
This commit is contained in:
Luca Bruno 2022-03-11 18:54:49 +00:00 committed by GitHub
parent 087f850227 0d020a7145
commit 2f11977da5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/boot/ostree-tmpfiles.conf
View File

@ -13,5 +13,7 @@
# You should have received a copy of the GNU Lesser General Public # You should have received a copy of the GNU Lesser General Public
# License along with this library. If not, see <https://www.gnu.org/licenses/>. # License along with this library. If not, see <https://www.gnu.org/licenses/>.
# ostree runtime configuration
d /run/ostree 0755 root root -
# https://github.com/ostreedev/ostree/issues/393 # https://github.com/ostreedev/ostree/issues/393
R! /var/tmp/ostree-unlock-ovl.* R! /var/tmp/ostree-unlock-ovl.*

13
tests/inst/src/sysroot.rs
View File

@ -1,5 +1,8 @@
//! Tests that mostly use the API and access the booted sysroot read-only. //! Tests that mostly use the API and access the booted sysroot read-only.
use std::os::unix::prelude::PermissionsExt;
use std::path::Path;
use anyhow::Result; use anyhow::Result;
use ostree_ext::prelude::*; use ostree_ext::prelude::*;
use ostree_ext::{gio, ostree}; use ostree_ext::{gio, ostree};
@ -45,3 +48,13 @@ fn test_immutable_bit() -> Result<()> {
cmd_has_output(sh_inline::bash_command!("lsattr -d /").unwrap(), "-i-")?; cmd_has_output(sh_inline::bash_command!("lsattr -d /").unwrap(), "-i-")?;
Ok(()) Ok(())
} }
#[itest]
fn test_tmpfiles() -> Result<()> {
if skip_non_ostree_host() {
return Ok(());
}
let metadata = Path::new("/run/ostree").metadata()?;
assert_eq!(metadata.permissions().mode() & !nix::libc::S_IFMT, 0o755);
Ok(())
}