45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
|
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
|
||
|
|
|