Skip to content
Closed
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions installer.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -1328,6 +1328,13 @@ ${BOLD}Do you want to continue?${RESET}" 20 80 || return
# clean up polkit rule - it's only useful in live systems
rm -f $TARGETDIR/etc/polkit-1/rules.d/void-live.rules

# remove agetty services for devices that are not present
for service in /var/service/agetty-*; do
if [ ! -e /dev/"$(cut -d'-' -f2 <<< "$service")" ]; then
Copy link
Copy Markdown
Member

@Duncaen Duncaen Mar 3, 2021

Choose a reason for hiding this comment

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

for service in /var/service/agetty-*; do
    [ -e "/dev/${service#*agetty-}" ] || rm -v "$service"
done

But shouldn't this be done in $TARGETDIR?

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

we should instead figure out why those services are getting auto-enabled in the first place, and then fix that

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This dracut hook enables all installed services on boot that are not excludes: https://github.com/void-linux/void-mklive/blob/master/dracut/vmklive/services.sh

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

well, since this dracut hook includes ttyS* already, it would make sense to add hvc0 and hvsi0 in there as well

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

actually, i have that already done here, along with proper enablement of serial console in live: void-ppc@8a3c5c0

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.

Great to see this fixed, albeit not the way I imagined.

How would the people that needs hvc0/hvsi consoles would enable them? Would that be specifying console on the command line (similarly as done for GCP images here), taken into account by dracut script of the live ISO (here)?

Copy link
Copy Markdown

@q66 q66 Mar 5, 2021

Choose a reason for hiding this comment

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

yeah just add the console= you want, e.g. console=hvc0 or console=ttyS0 and the new dracut hook will pick it up and enable the service

the only people who need hvc0 are users of openpower machines (ibm power8/power9) which expose the serial port through a firmware abstraction rather than directly, and some xen users; hvsi0 will have even fewer users

rm -v "$service"
fi
done

# enable text console for grub if chosen
if [ "$(get_option TEXTCONSOLE)" = "1" ]; then
sed -i $TARGETDIR/etc/default/grub \
Expand Down