-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
sesman/startwm.sh : add support for Alpine Linux #1965
Conversation
LGTM. |
Hi @fcolista Thanks very much for this. Could I trouble you to move your added stanza from the front of the existing list to the end (e.g. after the SuSE section)? There's a chance that an existing platform has both Apart from that I see no reason why this shouldn't be merged at all. |
Hi @matt335672, Thanks. .: Francesco |
Thanks for your contribution, @fcolista |
@fcolista @matt335672 Sorry for being late for the party, with the new block added to the end it won't be executed on Alpine because Alpine also has |
That's a little awkward, for the reasons posted above. Which apk provides |
Provided by xinit |
Yes - I've just configured an Alpine XFCE desktop so I can have a look at this. I installed the xrdp apk. The best solution I found is this:- --- startwm.sh.old
+++ startwm.sh
@@ -70,6 +70,18 @@
post_start
exit 0
fi
+
+ # Alpine
+ # Don't use /etc/X11/xinit/Xsession - it doesn't work
+ if [ -f /etc/alpine-release ]; then
+ if [ -f /etc/X11/xinit/xinitrc ]; then
+ pre_start
+ /etc/X11/xinit/xinitrc
+ post_start
+ else
+ echo "** xinit package isn't installed" >&2
+ fi
+ fi
# el I can add this in if you like, and revert the previous patch. If I do so I'll ask you to review it so you can test it. One other thing; If we go down this route, you might want to add a couple of dependencies to the
However, if used as-is, the script introduces a dependency on bash, and xinit. So if we go ahead with the above, should you not have a |
@pelepelin, @fcolista - I need some feedback on this. At the moment I suspect we don't want this (merged) patch at all, so it needs to be removed or replaced. I don't know which way you want to go. If I don't hear from you in a week or so, I'll unmerge this so at least we're in a sane state. I'm happy to work with you on this. |
@matt335672 I'm fine with adding xinit to the APKBUILD. I'm not sure on why you want bash. That /bin/sh is busybox ash. |
upstream requested this due to startwm.sh script to support alpine. See: neutrinolabs/xrdp#1965
@matt335672 ok, done. The Thanks. .: Francesco |
Ah ok, gotcha. I missed that part. Thanks. .: Francesco |
@fcolista - I'm having testing problems at the moment with xorgxrdp:-
xorgxrdp builds against xrdp, as they share a common file. I'm getting this error in the X server log from the xorgxrdp module:-
I suspect it's because xorgxrdp 0.2.17-r0 is being built on a machine with an older version of |
You should find xorgxrdp-0.2.17-r1 built against new xrdp: https://git.alpinelinux.org/aports/commit/?id=33a600962b8b This will took some time before mirrors got syncd after package build. .: Francesco |
Hello.
This patch adds support for Alpine Linux in order to correctly find the .xinitrc.
This patch follows up an issue in alpinelinux gitlab : https://gitlab.alpinelinux.org/alpine/aports/-/issues/12896
Credits to https://gitlab.alpinelinux.org/raidenii
Thank you!
.: Francesco