Track the active container on Fedora Linux Asahi Remix
This commit is contained in:
parent
a8d29ef83f
commit
e7a1de731b
@ -0,0 +1,44 @@
|
|||||||
|
From a3e8d8d12bac6dd63010b71c6e091486fb585f37 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Debarshi Ray <rishi@fedoraproject.org>
|
||||||
|
Date: Thu, 30 Nov 2023 19:22:56 +0100
|
||||||
|
Subject: [PATCH] cmd: Track the active container on Fedora Linux Asahi Remix
|
||||||
|
|
||||||
|
Christian Hergert requested this. He is working on improving the
|
||||||
|
integration of Toolbx with the terminal emulation stack in GNOME and
|
||||||
|
Fedora, and he is using Fedora Linux Asahi Remix for his work.
|
||||||
|
|
||||||
|
https://github.com/containers/toolbox/pull/1413
|
||||||
|
---
|
||||||
|
src/cmd/enter.go | 2 ++
|
||||||
|
src/cmd/rootMigrationPath.go | 2 ++
|
||||||
|
2 files changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/cmd/enter.go b/src/cmd/enter.go
|
||||||
|
index f902ff6787cd..2b89d2c853ae 100644
|
||||||
|
--- a/src/cmd/enter.go
|
||||||
|
+++ b/src/cmd/enter.go
|
||||||
|
@@ -138,6 +138,8 @@ func enter(cmd *cobra.Command, args []string) error {
|
||||||
|
|
||||||
|
if hostID == "fedora" && (hostVariantID == "silverblue" || hostVariantID == "workstation") {
|
||||||
|
emitEscapeSequence = true
|
||||||
|
+ } else if hostID == "fedora-asahi-remix" {
|
||||||
|
+ emitEscapeSequence = true
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := runCommand(container,
|
||||||
|
diff --git a/src/cmd/rootMigrationPath.go b/src/cmd/rootMigrationPath.go
|
||||||
|
index 40af5bd81d4e..92a24ac6edf6 100644
|
||||||
|
--- a/src/cmd/rootMigrationPath.go
|
||||||
|
+++ b/src/cmd/rootMigrationPath.go
|
||||||
|
@@ -86,6 +86,8 @@ func rootRunImpl(cmd *cobra.Command, args []string) error {
|
||||||
|
|
||||||
|
if hostID == "fedora" && (hostVariantID == "silverblue" || hostVariantID == "workstation") {
|
||||||
|
emitEscapeSequence = true
|
||||||
|
+ } else if hostID == "fedora-asahi-remix" {
|
||||||
|
+ emitEscapeSequence = true
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := runCommand(container,
|
||||||
|
--
|
||||||
|
2.42.0
|
||||||
|
|
@ -11,7 +11,7 @@ Version: 0.0.99.4
|
|||||||
%gometa -f
|
%gometa -f
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Summary: Tool for containerized command line environments on Linux
|
Summary: Tool for containerized command line environments on Linux
|
||||||
|
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
@ -25,6 +25,7 @@ Source1: %{name}.conf
|
|||||||
Patch0: toolbox-Build-fixes.patch
|
Patch0: toolbox-Build-fixes.patch
|
||||||
Patch1: toolbox-cmd-initContainer-Be-aware-of-security-hardened-moun.patch
|
Patch1: toolbox-cmd-initContainer-Be-aware-of-security-hardened-moun.patch
|
||||||
Patch2: toolbox-Simplify-removing-the-user-s-password.patch
|
Patch2: toolbox-Simplify-removing-the-user-s-password.patch
|
||||||
|
Patch3: toolbox-cmd-Track-the-active-container-on-Fedora-Linux-Asahi.patch
|
||||||
|
|
||||||
# Fedora specific
|
# Fedora specific
|
||||||
Patch100: toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch
|
Patch100: toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch
|
||||||
@ -172,6 +173,7 @@ The %{name}-tests package contains system tests for %{name}.
|
|||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
%ifnarch ppc64
|
%ifnarch ppc64
|
||||||
@ -254,6 +256,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Nov 30 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-7
|
||||||
|
- Track the active container on Fedora Linux Asahi Remix
|
||||||
|
|
||||||
* Thu Nov 09 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-6
|
* Thu Nov 09 2023 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.4-6
|
||||||
- Drop the custom /etc/containers/toolbox.conf from RHEL 10 onwards
|
- Drop the custom /etc/containers/toolbox.conf from RHEL 10 onwards
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user