[PR PATCH] greetd: set shell for agreety

[PR PATCH] greetd: set shell for agreety

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]

There is a new pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages greetd
https://github.com/void-linux/void-packages/pull/36552

greetd: set shell for agreety
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->
Closes #35870.

A patch file from https://github.com/void-linux/void-packages/pull/36552.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-greetd-36552.patch --]
[-- Type: text/x-diff, Size: 1705 bytes --]

From 3f98e143ddcde01f721226d9895c9897faa179ec Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 6 Apr 2022 22:36:09 -0400
Subject: [PATCH] greetd: set shell for agreety

---
 srcpkgs/greetd/patches/fix-shell.patch | 17 +++++++++++++++++
 srcpkgs/greetd/template                |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/greetd/patches/fix-shell.patch

diff --git a/srcpkgs/greetd/patches/fix-shell.patch b/srcpkgs/greetd/patches/fix-shell.patch
new file mode 100644
index 000000000000..fbe416cbed8d
--- /dev/null
+++ b/srcpkgs/greetd/patches/fix-shell.patch
@@ -0,0 +1,17 @@
+# $SHELL is not set, use /bin/sh because it's available
+diff --git a/config.toml b/config.toml
+index 3768a6e..c323af2 100644
+--- a/config.toml
++++ b/config.toml
+@@ -6,9 +6,9 @@ vt = 1
+ # The default session, also known as the greeter.
+ [default_session]
+ 
+-# `agreety` is the bundled agetty/login-lookalike. You can replace `$SHELL`
++# `agreety` is the bundled agetty/login-lookalike. You can replace `/bin/sh`
+ # with whatever you want started, such as `sway`.
+-command = "agreety --cmd $SHELL"
++command = "agreety --cmd /bin/sh"
+ 
+ # The user to run the command as. The privileges this user must have depends
+ # on the greeter. A graphical greeter may for example require the user to be
diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template
index cf5f3c400b0c..0f5e9c88f501 100644
--- a/srcpkgs/greetd/template
+++ b/srcpkgs/greetd/template
@@ -1,7 +1,7 @@
 # Template file for 'greetd'
 pkgname=greetd
 version=0.8.0
-revision=1
+revision=2
 build_style=cargo
 conf_files="/etc/greetd/config.toml"
 hostmakedepends="pkg-config scdoc"

Re: greetd: set shell for agreety

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/36552#issuecomment-1091022113

Comment:
Marking as draft until I can confirm that it fixes the linked issue.

Re: greetd: set shell for agreety

[RicArch97]

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

New comment by RicArch97 on void-packages repository

https://github.com/void-linux/void-packages/pull/36552#issuecomment-1092247034

Comment:
Tested this PR just now and can confirm that this solves #35870.

Re: greetd: set shell for agreety

[RicArch97]

[-- Attachment #1: Type: text/plain, Size: 567 bytes --]

New comment by RicArch97 on void-packages repository

https://github.com/void-linux/void-packages/pull/36552#issuecomment-1093460667

Comment:
Just a little quality of life change and perhaps not completely relevant to this PR, but wouldn't it make way more sense to change `vt = 1` to `vt = 7` by default in the config?  There is no `agetty-tty7` so there wouldn't collisions. Disabling the `agetty-tty1` service and then enabling `greetd` is quite a messy experience.

This way the `greetd` service can be enabled while TT1 is still active and not cause problems

Re: [PR PATCH] [Updated] greetd: set shell for agreety

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages greetd
https://github.com/void-linux/void-packages/pull/36552

greetd: set shell for agreety
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->
Closes #35870.

A patch file from https://github.com/void-linux/void-packages/pull/36552.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-greetd-36552.patch --]
[-- Type: text/x-diff, Size: 2455 bytes --]

From a87223cf1460d6579e478ca5d6a1905abbe7b609 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 11 Apr 2022 10:01:49 -0400
Subject: [PATCH] greetd: set shell for agreety, change default vt

---
 srcpkgs/greetd/patches/change-default-vt.patch | 13 +++++++++++++
 srcpkgs/greetd/patches/fix-shell.patch         | 17 +++++++++++++++++
 srcpkgs/greetd/template                        |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/greetd/patches/change-default-vt.patch
 create mode 100644 srcpkgs/greetd/patches/fix-shell.patch

diff --git a/srcpkgs/greetd/patches/change-default-vt.patch b/srcpkgs/greetd/patches/change-default-vt.patch
new file mode 100644
index 000000000000..3dad61740587
--- /dev/null
+++ b/srcpkgs/greetd/patches/change-default-vt.patch
@@ -0,0 +1,13 @@
+diff --git a/config.toml b/config.toml
+index 3768a6e315..2a933309b4 100644
+--- a/config.toml
++++ b/config.toml
+@@ -1,7 +1,7 @@
+ [terminal]
+ # The VT to run the greeter on. Can be "next", "current" or a number
+ # designating the VT.
+-vt = 1
++vt = 7
+ 
+ # The default session, also known as the greeter.
+ [default_session]
diff --git a/srcpkgs/greetd/patches/fix-shell.patch b/srcpkgs/greetd/patches/fix-shell.patch
new file mode 100644
index 000000000000..fbe416cbed8d
--- /dev/null
+++ b/srcpkgs/greetd/patches/fix-shell.patch
@@ -0,0 +1,17 @@
+# $SHELL is not set, use /bin/sh because it's available
+diff --git a/config.toml b/config.toml
+index 3768a6e..c323af2 100644
+--- a/config.toml
++++ b/config.toml
+@@ -6,9 +6,9 @@ vt = 1
+ # The default session, also known as the greeter.
+ [default_session]
+ 
+-# `agreety` is the bundled agetty/login-lookalike. You can replace `$SHELL`
++# `agreety` is the bundled agetty/login-lookalike. You can replace `/bin/sh`
+ # with whatever you want started, such as `sway`.
+-command = "agreety --cmd $SHELL"
++command = "agreety --cmd /bin/sh"
+ 
+ # The user to run the command as. The privileges this user must have depends
+ # on the greeter. A graphical greeter may for example require the user to be
diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template
index cf5f3c400b0c..0f5e9c88f501 100644
--- a/srcpkgs/greetd/template
+++ b/srcpkgs/greetd/template
@@ -1,7 +1,7 @@
 # Template file for 'greetd'
 pkgname=greetd
 version=0.8.0
-revision=1
+revision=2
 build_style=cargo
 conf_files="/etc/greetd/config.toml"
 hostmakedepends="pkg-config scdoc"

Re: greetd: set shell for agreety

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 165 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/36552#issuecomment-1095093584

Comment:
Sure, just changed it.

Re: [PR PATCH] [Merged]: greetd: set shell for agreety

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1103 bytes --]

There's a merged pull request on the void-packages repository

greetd: set shell for agreety
https://github.com/void-linux/void-packages/pull/36552

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->
Closes #35870.