From 3f7fdf0e4a6ed234588c45d5260f52b83e43d3f7 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Tue, 3 Nov 2020 17:37:21 +0100 Subject: [PATCH] put alsa in read-only Signed-off-by: Michel-FK --- FunKey/board/funkey/post-build.sh | 8 ++++++++ .../board/funkey/rootfs-overlay/etc/init.d/S50alsa-utils | 4 +++- Recovery/board/funkey/post-build.sh | 6 +++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/FunKey/board/funkey/post-build.sh b/FunKey/board/funkey/post-build.sh index 0f1abf1..c6d4a2f 100755 --- a/FunKey/board/funkey/post-build.sh +++ b/FunKey/board/funkey/post-build.sh @@ -7,5 +7,13 @@ sed -i '3iexport PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/b # Remove log daemon init scripts since they are loaded from inittab rm -f ${TARGET_DIR}/etc/init.d/S01syslogd ${TARGET_DIR}/etc/init.d/S02klogd +# Remove dhcp lib dir and link to /tmp +rm -rf ${TARGET_DIR}/var/lib/dhcp/ +ln -s /tmp ${TARGET_DIR}/var/lib/dhcp + +# Redirect drobear keys to /tmp +rm -rf ${TARGET_DIR}/etc/dropbear +ln -s /tmp ${TARGET_DIR}/etc/dropbear + # Change dropbear init sequence mv ${TARGET_DIR}/etc/init.d/S50dropbear ${TARGET_DIR}/etc/init.d/S42dropbear diff --git a/FunKey/board/funkey/rootfs-overlay/etc/init.d/S50alsa-utils b/FunKey/board/funkey/rootfs-overlay/etc/init.d/S50alsa-utils index 6621fe8..8a1131b 100755 --- a/FunKey/board/funkey/rootfs-overlay/etc/init.d/S50alsa-utils +++ b/FunKey/board/funkey/rootfs-overlay/etc/init.d/S50alsa-utils @@ -79,7 +79,7 @@ store_levels() CARD="$1" [ "$1" = all ] && CARD="" if MSG="$(alsactl -E HOME="$ALSACTLHOME" store $CARD 2>&1)" ; then - sleep 1 + #sleep 1 return 0 else log_action_cont_msg "warning: 'alsactl store${CARD:+ $CARD}' failed with error message '$MSG'" @@ -180,7 +180,9 @@ case "$1" in *) log_action_begin_msg "Stopping ALSA card ${TARGET_CARD}" ;; esac card_OK "$TARGET_CARD" || log_action_end_msg_and_exit "$( [ ! "$2" ] ; echo $? ; )" "none loaded" + rw store_levels "$TARGET_CARD" || EXITSTATUS=1 + ro #mute_and_zero_levels "$TARGET_CARD" || EXITSTATUS=1 log_action_end_msg_and_exit "$EXITSTATUS" ;; diff --git a/Recovery/board/funkey/post-build.sh b/Recovery/board/funkey/post-build.sh index 885e400..d55aed3 100755 --- a/Recovery/board/funkey/post-build.sh +++ b/Recovery/board/funkey/post-build.sh @@ -7,11 +7,15 @@ sed -i '3iexport PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/b # Remove log daemon init scripts since they are loaded from inittab rm -f ${TARGET_DIR}/etc/init.d/S01syslogd ${TARGET_DIR}/etc/init.d/S02klogd +# Remove dhcp lib dir and link to /tmp +rm -rf ${TARGET_DIR}/var/lib/dhcp/ +ln -s /tmp ${TARGET_DIR}/var/lib/dhcp + # Change dropbear init sequence mv ${TARGET_DIR}/etc/init.d/S50dropbear ${TARGET_DIR}/etc/init.d/S42dropbear # Redirect drobear keys to /tmp -rm ${TARGET_DIR}/etc/dropbear +rm -rf ${TARGET_DIR}/etc/dropbear ln -s /tmp ${TARGET_DIR}/etc/dropbear # Generate U-Boot environment