wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix multiple startup bugs

Browse source 
* Revert enabling blkid in e2fsprogs, this conflicts with the busybox binary and causes partitions to fail to resize on first boot.
  * Optimize startup order and apply a guard to set_settings to ensure the system configuration exists before writing to it.  This resolves black screen issues that sometimes occur during the initial boot.
This commit is contained in:
fewtarius 2024-01-16 12:38:18 +00:00
parent 22a5d4afc9
commit 9dd0d3270d
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
5 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/jelos/profile.d/001-functions
View file

@ -108,6 +108,16 @@ function sort_settings() {
}
function set_setting() {
if [ ! -d "/storage/.config/system/configs" ]
then
mkdir -p /storage/.config/system/configs
fi
if [ ! -e "/storage/.config/system/configs/system.cfg" ]
then
cp -f /usr/config/system/configs/system.cfg /storage/.config/system/configs/system.cfg
fi
if [[ "${1}" =~ ^[[:alnum:]] ]]
then
del_setting "${1}"

10
packages/sysutils/e2fsprogs/package.mk
View file

@ -74,7 +74,17 @@ pre_configure() {
post_makeinstall_target() {
make -C lib/et LIBMODE=644 DESTDIR=${SYSROOT_PREFIX} install
rm -rf ${INSTALL}/usr/sbin/badblocks
rm -rf ${INSTALL}/usr/sbin/blkid
rm -rf ${INSTALL}/usr/sbin/dumpe2fs
rm -rf ${INSTALL}/usr/sbin/e2freefrag
rm -rf ${INSTALL}/usr/sbin/e2undo
rm -rf ${INSTALL}/usr/sbin/e4defrag
#rm -rf ${INSTALL}/usr/sbin/filefrag
rm -rf ${INSTALL}/usr/sbin/fsck
rm -rf ${INSTALL}/usr/sbin/logsave
rm -rf ${INSTALL}/usr/sbin/mklost+found
}
makeinstall_init() {

8
packages/sysutils/systemd/scripts/userconfig-setup
View file

@ -10,16 +10,16 @@ if [ ! -e "/storage/.configured" ]
then
tocon "Initializing configuration..."
# Copy config files
rsync -a --exclude={es_features.cfg,es_systems.cfg} /usr/config/* /storage/.config/ >/var/log/configure.log 2>&1
rsync -a --ignore-existing --exclude={es_features.cfg,es_systems.cfg} /usr/config/* /storage/.config/ >/var/log/configure.log 2>&1
if [ -d "/usr/lib/autostart/quirks/platforms/${HW_DEVICE}/config" ]
then
rsync -a --exclude={es_features.cfg,es_systems.cfg} /usr/lib/autostart/quirks/platforms/"${HW_DEVICE}"/config/* /storage/.config/ >>/var/log/configure.log 2>&1
rsync -a /usr/lib/autostart/quirks/platforms/"${HW_DEVICE}"/config/* /storage/.config/ >>/var/log/configure.log 2>&1
fi
if [ -d "/usr/lib/autostart/quirks/devices/${QUIRK_DEVICE}/config" ]
then
rsync -a --exclude={es_features.cfg,es_systems.cfg} /usr/lib/autostart/quirks/devices/"${QUIRK_DEVICE}"/config/* /storage/.config/ >>/var/log/configure.log 2>&1
rsync -a /usr/lib/autostart/quirks/devices/"${QUIRK_DEVICE}"/config/* /storage/.config/ >>/var/log/configure.log 2>&1
fi
if [ -e "/usr/bin/emulationstation" ]
@ -38,11 +38,11 @@ then
do
ln -s /usr/config/emulationstation/${es_cfg} /storage/.config/emulationstation/${es_cfg} >/dev/null 2>&1
done
fi
mkdir -p /storage/.config/modprobe.d >/dev/null 2>&1
touch /storage/.configured >/dev/null 2>&1
sync
fi
if [ ! -e "/storage/.cache/ld.so.cache" ]

1
packages/sysutils/systemd/system.d/usercache.service
View file

@ -2,6 +2,7 @@
Description=Setup User cache dir
DefaultDependencies=no
After=systemd-tmpfiles-setup.service
Before=automount.service autostart.service
[Service]
Type=oneshot

3
packages/sysutils/systemd/system.d/userconfig.service
View file

@ -1,7 +1,8 @@
[Unit]
Description=Setup User config dir
DefaultDependencies=no
After=systemd-tmpfiles-setup.service jelos-automount.service
After=systemd-tmpfiles-setup.service
Before=jelos-automount.service autostart.service
[Service]
Type=oneshot