From c8054080e9b6352cd35e9ea108e92021439e2c65 Mon Sep 17 00:00:00 2001 From: Anhad Singh Date: Thu, 6 Jul 2023 16:29:44 +1000 Subject: [PATCH 1/2] configs: do not pass the display path to orbital Signed-off-by: Anhad Singh --- config/aarch64/demo.toml | 2 +- config/aarch64/desktop.toml | 2 +- config/i686/demo.toml | 2 +- config/i686/desktop-minimal.toml | 2 +- config/i686/desktop.toml | 2 +- config/i686/jeremy.toml | 2 +- config/x86_64/demo.toml | 2 +- config/x86_64/desktop.toml | 2 +- config/x86_64/dev.toml | 2 +- config/x86_64/jeremy.toml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/aarch64/demo.toml b/config/aarch64/demo.toml index 46ed745..b45fa0f 100644 --- a/config/aarch64/demo.toml +++ b/config/aarch64/demo.toml @@ -76,7 +76,7 @@ dhcpd -b path = "/etc/init.d/20_orbital" data = """ audiod -orbital display:3/activate launcher +orbital launcher """ [[files]] diff --git a/config/aarch64/desktop.toml b/config/aarch64/desktop.toml index e9b7345..44e9fdf 100644 --- a/config/aarch64/desktop.toml +++ b/config/aarch64/desktop.toml @@ -76,7 +76,7 @@ dhcpd -b path = "/etc/init.d/20_orbital" data = """ audiod -orbital display:3/activate orblogin launcher +orbital orblogin launcher """ [[files]] diff --git a/config/i686/demo.toml b/config/i686/demo.toml index 9c88f7f..086aac1 100644 --- a/config/i686/demo.toml +++ b/config/i686/demo.toml @@ -111,7 +111,7 @@ dhcpd -b path = "/etc/init.d/20_orbital" data = """ audiod -orbital display:3/activate orblogin launcher +orbital orblogin launcher """ [[files]] diff --git a/config/i686/desktop-minimal.toml b/config/i686/desktop-minimal.toml index b2693b6..acba70b 100644 --- a/config/i686/desktop-minimal.toml +++ b/config/i686/desktop-minimal.toml @@ -51,7 +51,7 @@ escalated [[files]] path = "/etc/init.d/20_orbital" data = """ -orbital display:3/activate orblogin launcher +orbital orblogin launcher """ [[files]] diff --git a/config/i686/desktop.toml b/config/i686/desktop.toml index 935f310..89ad128 100644 --- a/config/i686/desktop.toml +++ b/config/i686/desktop.toml @@ -77,7 +77,7 @@ dhcpd -b path = "/etc/init.d/20_orbital" data = """ audiod -orbital display:3/activate orblogin launcher +orbital orblogin launcher """ [[files]] diff --git a/config/i686/jeremy.toml b/config/i686/jeremy.toml index dfc5f07..5ae2e95 100644 --- a/config/i686/jeremy.toml +++ b/config/i686/jeremy.toml @@ -108,7 +108,7 @@ dhcpd -b path = "/etc/init.d/20_orbital" data = """ audiod -orbital display:3/activate orblogin launcher +orbital orblogin launcher """ [[files]] diff --git a/config/x86_64/demo.toml b/config/x86_64/demo.toml index cec9dcc..a8e192f 100644 --- a/config/x86_64/demo.toml +++ b/config/x86_64/demo.toml @@ -130,7 +130,7 @@ dhcpd -b path = "/etc/init.d/20_orbital" data = """ audiod -orbital display:3/activate orblogin launcher +orbital orblogin launcher """ [[files]] diff --git a/config/x86_64/desktop.toml b/config/x86_64/desktop.toml index 935f310..89ad128 100644 --- a/config/x86_64/desktop.toml +++ b/config/x86_64/desktop.toml @@ -77,7 +77,7 @@ dhcpd -b path = "/etc/init.d/20_orbital" data = """ audiod -orbital display:3/activate orblogin launcher +orbital orblogin launcher """ [[files]] diff --git a/config/x86_64/dev.toml b/config/x86_64/dev.toml index 970e9a5..3457456 100644 --- a/config/x86_64/dev.toml +++ b/config/x86_64/dev.toml @@ -100,7 +100,7 @@ dhcpd -b path = "/etc/init.d/20_orbital" data = """ audiod -orbital display:3/activate orblogin launcher +orbital orblogin launcher """ [[files]] diff --git a/config/x86_64/jeremy.toml b/config/x86_64/jeremy.toml index 4efaf65..0fdfd04 100644 --- a/config/x86_64/jeremy.toml +++ b/config/x86_64/jeremy.toml @@ -173,7 +173,7 @@ dhcpd -b path = "/etc/init.d/20_orbital" data = """ audiod -orbital display:3/activate orblogin launcher +orbital orblogin launcher """ [[files]] From 8d4c36ec5eb559a392f4cf7328b1b23215f032f6 Mon Sep 17 00:00:00 2001 From: Anhad Singh Date: Fri, 7 Jul 2023 17:52:44 +1000 Subject: [PATCH 2/2] configs: misc changes for GPU drivers * Do not pass the display path to orbital * Getty should open at display/vesa:2 Signed-off-by: Anhad Singh --- config/aarch64/demo.toml | 2 +- config/aarch64/desktop.toml | 2 +- config/aarch64/server.toml | 2 +- config/i686/demo.toml | 2 +- config/i686/desktop-minimal.toml | 2 +- config/i686/desktop.toml | 2 +- config/i686/jeremy.toml | 2 +- config/i686/server-minimal.toml | 2 +- config/i686/server.toml | 2 +- config/x86_64/demo.toml | 2 +- config/x86_64/desktop.toml | 2 +- config/x86_64/dev.toml | 2 +- config/x86_64/jeremy.toml | 2 +- config/x86_64/server.toml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/config/aarch64/demo.toml b/config/aarch64/demo.toml index b45fa0f..c30ffbb 100644 --- a/config/aarch64/demo.toml +++ b/config/aarch64/demo.toml @@ -82,7 +82,7 @@ orbital launcher [[files]] path = "/etc/init.d/30_console" data = """ -getty display:2 +getty display/vesa:2 getty debug: -J """ diff --git a/config/aarch64/desktop.toml b/config/aarch64/desktop.toml index 44e9fdf..d30496f 100644 --- a/config/aarch64/desktop.toml +++ b/config/aarch64/desktop.toml @@ -82,7 +82,7 @@ orbital orblogin launcher [[files]] path = "/etc/init.d/30_console" data = """ -getty display:2 +getty display/vesa:2 getty debug: -J """ diff --git a/config/aarch64/server.toml b/config/aarch64/server.toml index 6e1b1e1..51e16ca 100644 --- a/config/aarch64/server.toml +++ b/config/aarch64/server.toml @@ -72,7 +72,7 @@ dhcpd -b [[files]] path = "/etc/init.d/30_console" data = """ -getty display:2/activate +getty display/vesa:2/activate getty debug: -J """ diff --git a/config/i686/demo.toml b/config/i686/demo.toml index 086aac1..e7e450b 100644 --- a/config/i686/demo.toml +++ b/config/i686/demo.toml @@ -117,7 +117,7 @@ orbital orblogin launcher [[files]] path = "/etc/init.d/30_console" data = """ -getty display:2 +getty display/vesa:2 getty debug: -J """ diff --git a/config/i686/desktop-minimal.toml b/config/i686/desktop-minimal.toml index acba70b..fefe6e0 100644 --- a/config/i686/desktop-minimal.toml +++ b/config/i686/desktop-minimal.toml @@ -57,7 +57,7 @@ orbital orblogin launcher [[files]] path = "/etc/init.d/30_console" data = """ -getty display:2 +getty display/vesa:2 getty debug: -J """ diff --git a/config/i686/desktop.toml b/config/i686/desktop.toml index 89ad128..5b371c2 100644 --- a/config/i686/desktop.toml +++ b/config/i686/desktop.toml @@ -83,7 +83,7 @@ orbital orblogin launcher [[files]] path = "/etc/init.d/30_console" data = """ -getty display:2 +getty display/vesa:2 getty debug: -J """ diff --git a/config/i686/jeremy.toml b/config/i686/jeremy.toml index 5ae2e95..570e6ae 100644 --- a/config/i686/jeremy.toml +++ b/config/i686/jeremy.toml @@ -114,7 +114,7 @@ orbital orblogin launcher [[files]] path = "/etc/init.d/30_console" data = """ -getty display:2 +getty display/vesa:2 getty debug: -J """ diff --git a/config/i686/server-minimal.toml b/config/i686/server-minimal.toml index 5c43880..9796433 100644 --- a/config/i686/server-minimal.toml +++ b/config/i686/server-minimal.toml @@ -45,7 +45,7 @@ escalated [[files]] path = "/etc/init.d/30_console" data = """ -getty display:2/activate +getty display/vesa:2/activate getty debug: -J """ diff --git a/config/i686/server.toml b/config/i686/server.toml index b355832..185672e 100644 --- a/config/i686/server.toml +++ b/config/i686/server.toml @@ -68,7 +68,7 @@ dhcpd -b [[files]] path = "/etc/init.d/30_console" data = """ -getty display:2/activate +getty display/vesa:2/activate getty debug: -J """ diff --git a/config/x86_64/demo.toml b/config/x86_64/demo.toml index a8e192f..01b6e1b 100644 --- a/config/x86_64/demo.toml +++ b/config/x86_64/demo.toml @@ -136,7 +136,7 @@ orbital orblogin launcher [[files]] path = "/etc/init.d/30_console" data = """ -getty display:2 +getty display/vesa:2 getty debug: -J """ diff --git a/config/x86_64/desktop.toml b/config/x86_64/desktop.toml index 89ad128..5b371c2 100644 --- a/config/x86_64/desktop.toml +++ b/config/x86_64/desktop.toml @@ -83,7 +83,7 @@ orbital orblogin launcher [[files]] path = "/etc/init.d/30_console" data = """ -getty display:2 +getty display/vesa:2 getty debug: -J """ diff --git a/config/x86_64/dev.toml b/config/x86_64/dev.toml index 3457456..2671765 100644 --- a/config/x86_64/dev.toml +++ b/config/x86_64/dev.toml @@ -106,7 +106,7 @@ orbital orblogin launcher [[files]] path = "/etc/init.d/30_console" data = """ -getty display:2 +getty display/vesa:2 getty debug: -J """ diff --git a/config/x86_64/jeremy.toml b/config/x86_64/jeremy.toml index 0fdfd04..601d19d 100644 --- a/config/x86_64/jeremy.toml +++ b/config/x86_64/jeremy.toml @@ -179,7 +179,7 @@ orbital orblogin launcher [[files]] path = "/etc/init.d/30_console" data = """ -getty display:2 +getty display/vesa:2 getty debug: -J """ diff --git a/config/x86_64/server.toml b/config/x86_64/server.toml index 8055a85..8bfc97e 100644 --- a/config/x86_64/server.toml +++ b/config/x86_64/server.toml @@ -68,7 +68,7 @@ dhcpd -b [[files]] path = "/etc/init.d/30_console" data = """ -getty display:2/activate +getty display/vesa:2/activate getty debug: -J """