Skip to content

Commit

Permalink
Merge pull request #5210 from cgwalters/two-misc
Browse files Browse the repository at this point in the history
  • Loading branch information
jlebon authored Jan 10, 2025
2 parents b363506 + 912e8d1 commit 72ba3ef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
9 changes: 0 additions & 9 deletions packaging/Dockerfile

This file was deleted.

4 changes: 2 additions & 2 deletions rust/src/cliwrap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ pub const CLIWRAP_DESTDIR: &str = "usr/libexec/rpm-ostree/wrapped";
const KERNEL_INSTALL: &str = "usr/bin/kernel-install";

/// Binaries that will be wrapped if they exist.
static WRAPPED_BINARIES: &[&str] = &["usr/bin/rpm", "usr/bin/dracut", "usr/sbin/grubby"];
const WRAPPED_BINARIES: &[&str] = &["usr/bin/rpm", "usr/bin/dracut", "usr/sbin/grubby"];

/// Binaries we will wrap, or create if they don't exist.
static MUSTWRAP_BINARIES: &[&str] = &["usr/bin/yum", "usr/bin/dnf"];
const MUSTWRAP_BINARIES: &[&str] = &["usr/bin/yum", "usr/bin/dnf"];

#[derive(Debug, PartialEq)]
pub(crate) enum RunDisposition {
Expand Down

0 comments on commit 72ba3ef

Please sign in to comment.