Skip to content

Fixes to weston startup #156

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.

Sign up for GitHub

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

Open
marmarek wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes to weston startup #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e83afd2
Switch VT before starting weston
marmarek Nov 11, 2024
47ccca2
Try to use outputs on all cards
marmarek Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions initial-setup.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ Summary: Run the initial-setup GUI in Wayland
Requires: %{name}-gui = %{version}-%{release}
Requires: weston
Requires: xorg-x11-server-Xwayland
Requires: kbd

Provides: firstboot(gui-backend)
Conflicts: firstboot(gui-backend)
Expand Down
18 changes: 17 additions & 1 deletion scripts/run-gui-backend.guiweston
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,24 @@ EOF

chmod +x ${RUN_SCRIPT}

weston --config=${CONFIG_FILE} --socket=wl-firstboot-0
original_vt=
if [ -n "$XDG_VTNR" ]; then
original_vt=$(fgconsole)
# change to VT on which we run to get access to devices
chvt "${XDG_VTNR}"
fi
Comment on lines +27 to +32

cards=$(ls -d /sys/class/drm/card*| grep -v -- -| cut -d / -f 5)
primary_card=$(echo "$cards" | head -1 )
secondary_cards=$(echo "$cards"|
tail -n +2|
xargs printf "%s,")

weston --config=${CONFIG_FILE} --socket=wl-firstboot-0 --drm-device="$primary_card" --additional-devices="$secondary_cards"
Comment on lines +34 to +40

@KKoukiou KKoukiou Jun 2, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this i wrong. I have only one card and I don't get this:

kkoukiou@fedora:~/repos/anaconda-webui$ cards=$(ls -d /sys/class/drm/card*| grep -v -- -| cut -d / -f 5)
kkoukiou@fedora:~/repos/anaconda-webui$ primary_card=$(echo "$cards" | head -1 )
kkoukiou@fedora:~/repos/anaconda-webui$ echo $primary_card
card1
kkoukiou@fedora:~/repos/anaconda-webui$ secondary_cards=$(echo "$cards"|
                  tail -n +2|
                  xargs printf "%s,")
kkoukiou@fedora:~/repos/anaconda-webui$ echo $secondary_card

@rvykydal rvykydal Jun 3, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@KKoukiou I think the difference is you are echoing $secondary_card instead of $secondary_cards
My check:

[prnot5 ~/work/scratch]$ cards=$(ls -d /sys/class/drm/card*| grep -v -- -| cut -d / -f 5)
[prnot5 ~/work/scratch]$ primary_card=$(echo "$cards" | head -1 )
[prnot5 ~/work/scratch]$ echo $primary_card
card1
[prnot5 ~/work/scratch]$ secondary_cards=$(echo "$cards"|
                  tail -n +2|
                  xargs printf "%s,")
[prnot5 ~/work/scratch]$ echo $secondary_cards
,

@rvykydal rvykydal Jun 3, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But as I said below I am not sure if comma is harmful for the command option.

@marmarek marmarek Jun 3, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--additional-devices=, seems to work just fine. weston uses strtok() to parse that option, it it skips empty names.

exit_code=$(< ${EXIT_CODE_SAVE})

rm ${CONFIG_FILE} ${RUN_SCRIPT} ${EXIT_CODE_SAVE}
if [ -n "$original_vt" ]; then
chvt "$original_vt"
fi
exit $exit_code