From 48ca0e2f0d7ff3e15184dc99148de128a847f4c3 Mon Sep 17 00:00:00 2001 From: David P Date: Sun, 21 Feb 2021 21:11:03 -0300 Subject: Multiple fixes in openrc profiles * add missing livecd-sound files * fix the livecd-sound local.d scripts * replace alsa-utils with alsa-utils-openrc in packages.both * define correct file permissions in profiledef.sh NOTE: braille support in OpenRC ISOs is still a WIP Signed-off-by: David P --- configs/lxde-openrc/airootfs/etc/local.d/livecd-talk.start | 2 +- .../airootfs/usr/local/share/livecd-sound/asound.conf.in | 3 +++ configs/lxde-openrc/packages.both | 2 +- configs/lxde-openrc/profiledef.sh | 6 +++++- configs/releng-openrc/airootfs/etc/local.d/livecd-talk.start | 2 +- .../airootfs/usr/local/share/livecd-sound/asound.conf.in | 3 +++ configs/releng-openrc/packages.both | 2 +- configs/releng-openrc/profiledef.sh | 6 +++++- 8 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 configs/lxde-openrc/airootfs/usr/local/share/livecd-sound/asound.conf.in create mode 100644 configs/releng-openrc/airootfs/usr/local/share/livecd-sound/asound.conf.in diff --git a/configs/lxde-openrc/airootfs/etc/local.d/livecd-talk.start b/configs/lxde-openrc/airootfs/etc/local.d/livecd-talk.start index 4c1813b..f826cdd 100755 --- a/configs/lxde-openrc/airootfs/etc/local.d/livecd-talk.start +++ b/configs/lxde-openrc/airootfs/etc/local.d/livecd-talk.start @@ -7,5 +7,5 @@ if grep -qo 'accessibility=on' /proc/cmdline; then chvt 13 livecd-sound -p chvt 1 - rc-service start espeakup + rc-service espeakup start fi diff --git a/configs/lxde-openrc/airootfs/usr/local/share/livecd-sound/asound.conf.in b/configs/lxde-openrc/airootfs/usr/local/share/livecd-sound/asound.conf.in new file mode 100644 index 0000000..3f9c7aa --- /dev/null +++ b/configs/lxde-openrc/airootfs/usr/local/share/livecd-sound/asound.conf.in @@ -0,0 +1,3 @@ +Defaults node +defaults.ctl.card %card%; +defaults.pcm.card %card%; diff --git a/configs/lxde-openrc/packages.both b/configs/lxde-openrc/packages.both index fea52d0..4f563fc 100644 --- a/configs/lxde-openrc/packages.both +++ b/configs/lxde-openrc/packages.both @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later #Base -alsa-utils +alsa-utils-openrc arch-install-scripts base bind-tools diff --git a/configs/lxde-openrc/profiledef.sh b/configs/lxde-openrc/profiledef.sh index f251b5a..173e46f 100644 --- a/configs/lxde-openrc/profiledef.sh +++ b/configs/lxde-openrc/profiledef.sh @@ -12,10 +12,14 @@ arch="dual" pacman_conf="pacman.conf" airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M') file_permissions=( + ["/etc/local.d/choose-mirror.start"]="0:0:755" + ["/etc/local.d/etc-pacman.d-gnupg.start"]="0:0:755" + ["/etc/local.d/livecd-talk.start"]="0:0:755" + ["/etc/local.d/pacman-init.start"]="0:0:755" ["/etc/shadow"]="0:0:400" ["/root"]="0:0:750" ["/root/.automated_script.sh"]="0:0:755" ["/usr/local/bin/choose-mirror"]="0:0:755" ["/usr/local/bin/Installation_guide"]="0:0:755" -# ["/usr/local/bin/livecd-sound"]="0:0:755" + ["/usr/local/bin/livecd-sound"]="0:0:755" ) diff --git a/configs/releng-openrc/airootfs/etc/local.d/livecd-talk.start b/configs/releng-openrc/airootfs/etc/local.d/livecd-talk.start index 4c1813b..f826cdd 100755 --- a/configs/releng-openrc/airootfs/etc/local.d/livecd-talk.start +++ b/configs/releng-openrc/airootfs/etc/local.d/livecd-talk.start @@ -7,5 +7,5 @@ if grep -qo 'accessibility=on' /proc/cmdline; then chvt 13 livecd-sound -p chvt 1 - rc-service start espeakup + rc-service espeakup start fi diff --git a/configs/releng-openrc/airootfs/usr/local/share/livecd-sound/asound.conf.in b/configs/releng-openrc/airootfs/usr/local/share/livecd-sound/asound.conf.in new file mode 100644 index 0000000..3f9c7aa --- /dev/null +++ b/configs/releng-openrc/airootfs/usr/local/share/livecd-sound/asound.conf.in @@ -0,0 +1,3 @@ +Defaults node +defaults.ctl.card %card%; +defaults.pcm.card %card%; diff --git a/configs/releng-openrc/packages.both b/configs/releng-openrc/packages.both index 28d6ebf..f139e6e 100644 --- a/configs/releng-openrc/packages.both +++ b/configs/releng-openrc/packages.both @@ -1,6 +1,6 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -alsa-utils +alsa-utils-openrc arch-install-scripts base bind-tools diff --git a/configs/releng-openrc/profiledef.sh b/configs/releng-openrc/profiledef.sh index 9095fef..b97487b 100644 --- a/configs/releng-openrc/profiledef.sh +++ b/configs/releng-openrc/profiledef.sh @@ -12,10 +12,14 @@ arch="dual" pacman_conf="pacman.conf" airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M') file_permissions=( + ["/etc/local.d/choose-mirror.start"]="0:0:755" + ["/etc/local.d/etc-pacman.d-gnupg.start"]="0:0:755" + ["/etc/local.d/livecd-talk.start"]="0:0:755" + ["/etc/local.d/pacman-init.start"]="0:0:755" ["/etc/shadow"]="0:0:400" ["/root"]="0:0:750" ["/root/.automated_script.sh"]="0:0:755" ["/usr/local/bin/choose-mirror"]="0:0:755" ["/usr/local/bin/Installation_guide"]="0:0:755" -# ["/usr/local/bin/livecd-sound"]="0:0:755" + ["/usr/local/bin/livecd-sound"]="0:0:755" ) -- cgit v1.2.2