diff --git a/Dockerfile.agnos b/Dockerfile.agnos index 000a1dc..9aa38e6 100644 --- a/Dockerfile.agnos +++ b/Dockerfile.agnos @@ -85,7 +85,11 @@ COPY ./userspace/root/etc/ /etc/ COPY ./userspace/root/lib/ /usr/lib/ COPY ./userspace/root/sbin/ /usr/sbin/ COPY ./userspace/root/system/ /system/ -COPY ./userspace/root/usr/ /usr/ +COPY ./userspace/root/usr/bin/ /usr/bin/ +COPY ./userspace/root/usr/lib/ /usr/lib/ +COPY ./userspace/root/usr/lib64/ /usr/lib64/ +COPY ./userspace/root/usr/local/ /usr/local/ +COPY ./userspace/root/usr/sbin/ /usr/sbin/ RUN mkdir -p /dsp /firmware /persist /data /cache /rwtmp COPY --from=agnos-compiler-libqmi /tmp/libqmi.deb /tmp/ @@ -124,8 +128,8 @@ RUN source $XDG_DATA_HOME/venv/bin/activate && \ COPY ./userspace/install_extras.sh /tmp/agnos/ RUN /tmp/agnos/install_extras.sh -COPY ./userspace/home/ /home/$USERNAME/ -COPY ./userspace/home/.config/ /root/.config +COPY ./userspace/root/home/comma/ /home/$USERNAME/ +COPY ./userspace/root/home/comma/.config/ /root/.config RUN chown -R $USERNAME: /home/$USERNAME/.config # populate /lib @@ -135,7 +139,6 @@ COPY ./userspace/files/*.service /lib/systemd/system/ COPY ./userspace/files/*.timer /lib/systemd/system/ COPY ./userspace/files/serial-getty@ttyMSM0_override.conf /lib/systemd/system/serial-getty@ttyMSM0.service.d/serial-getty@ttyMSM0_override.conf COPY ./userspace/files/ssh_override.conf /lib/systemd/system/ssh.service.d/override.conf -COPY ./userspace/firmware/* /lib/firmware/ # populate /etc COPY ./userspace/files/fstab /etc @@ -149,8 +152,8 @@ RUN chmod 644 /etc/logrotate.conf RUN touch -r /lib/systemd/systemd /etc/fstab # populate /usr -COPY ./userspace/usr/comma/ /usr/$USERNAME/ -COPY ./userspace/usr/share/fonts/* /usr/share/fonts/ +COPY ./userspace/root/usr/comma/ /usr/$USERNAME/ +COPY ./userspace/root/usr/share/fonts/* /usr/share/fonts/ COPY ./userspace/libs/* /usr/lib/aarch64-linux-gnu/ COPY ./output/linux-headers/include/ /usr/include/ @@ -164,7 +167,7 @@ RUN /tmp/agnos/services.sh # MOTD RUN rm -r /etc/update-motd.d/* -COPY --chown=root:root ./userspace/motd/* /etc/update-motd.d/ +COPY --chown=root:root ./userspace/root/etc/update-motd.d/* /etc/update-motd.d/ # Let NetworkManager manage eth0 COPY ./userspace/files/10-globally-managed-devices.conf /etc/NetworkManager/conf.d/10-globally-managed-devices.conf @@ -189,9 +192,6 @@ COPY ./userspace/files/avahi-override.conf /etc/systemd/system/avahi-daemon.serv # Prevent polkitd memory leak from getting out of hand by restarting it every ~day COPY ./userspace/files/polkit-override.conf /etc/systemd/system/polkit.service.d/override.conf -# Add iptable rules to block incoming traffic on wwan0 -COPY ./userspace/etc/iptables/rules.v4 /etc/iptables/rules.v4 - # Run ModemManager in debug mode to allow AT commands COPY ./userspace/files/ModemManager.service /lib/systemd/system/ RUN systemctl enable ModemManager diff --git a/README.md b/README.md index 8dfeb4d..4f1e869 100644 --- a/README.md +++ b/README.md @@ -32,9 +32,9 @@ git submodule update --init agnos-kernel-sdm845 ``` cd /path/to/openpilot - python release/pack.py -o /path/to/agnos-builder/userspace/usr/comma/setup openpilot.system.ui.mici_setup - python release/pack.py -o /path/to/agnos-builder/userspace/usr/comma/reset openpilot.system.ui.reset - python release/pack.py -o /path/to/agnos-builder/userspace/usr/comma/updater openpilot.system.ui.updater + python release/pack.py -o /path/to/agnos-builder/userspace/root/usr/comma/setup openpilot.system.ui.mici_setup + python release/pack.py -o /path/to/agnos-builder/userspace/root/usr/comma/reset openpilot.system.ui.reset + python release/pack.py -o /path/to/agnos-builder/userspace/root/usr/comma/updater openpilot.system.ui.updater ``` 3. Build the kernel and system images: diff --git a/scripts/setup-on-device.sh b/scripts/setup-on-device.sh index 0ce1ebd..31501b6 100755 --- a/scripts/setup-on-device.sh +++ b/scripts/setup-on-device.sh @@ -14,7 +14,7 @@ sudo resize2fs $(findmnt -n -o SOURCE /) echo "symlink /usr/comma" sudo rm -rf /usr/comma -sudo ln -snf $ROOT/userspace/usr/comma/ /usr/comma +sudo ln -snf $ROOT/userspace/root/usr/comma/ /usr/comma echo "cp systemd services" for s in $(ls $ROOT/userspace/files/*.service); do diff --git a/userspace/.gitattributes b/userspace/.gitattributes index ee2edf9..91e856b 100644 --- a/userspace/.gitattributes +++ b/userspace/.gitattributes @@ -1,6 +1,6 @@ -usr/comma/wlan.ko filter=lfs diff=lfs merge=lfs -text -usr/comma/wifi filter=lfs diff=lfs merge=lfs -text -usr/comma/reset filter=lfs diff=lfs merge=lfs -text -usr/comma/setup filter=lfs diff=lfs merge=lfs -text -usr/comma/installer filter=lfs diff=lfs merge=lfs -text -usr/comma/updater filter=lfs diff=lfs merge=lfs -text +root/usr/comma/wlan.ko filter=lfs diff=lfs merge=lfs -text +root/usr/comma/wifi filter=lfs diff=lfs merge=lfs -text +root/usr/comma/reset filter=lfs diff=lfs merge=lfs -text +root/usr/comma/setup filter=lfs diff=lfs merge=lfs -text +root/usr/comma/installer filter=lfs diff=lfs merge=lfs -text +root/usr/comma/updater filter=lfs diff=lfs merge=lfs -text diff --git a/userspace/etc/iptables/rules.v4 b/userspace/root/etc/iptables/rules.v4 similarity index 100% rename from userspace/etc/iptables/rules.v4 rename to userspace/root/etc/iptables/rules.v4 diff --git a/userspace/motd/00-comma b/userspace/root/etc/update-motd.d/00-comma similarity index 100% rename from userspace/motd/00-comma rename to userspace/root/etc/update-motd.d/00-comma diff --git a/userspace/motd/10-header b/userspace/root/etc/update-motd.d/10-header similarity index 100% rename from userspace/motd/10-header rename to userspace/root/etc/update-motd.d/10-header diff --git a/userspace/motd/20-quickstart b/userspace/root/etc/update-motd.d/20-quickstart similarity index 100% rename from userspace/motd/20-quickstart rename to userspace/root/etc/update-motd.d/20-quickstart diff --git a/userspace/motd/30-spacer b/userspace/root/etc/update-motd.d/30-spacer similarity index 100% rename from userspace/motd/30-spacer rename to userspace/root/etc/update-motd.d/30-spacer diff --git a/userspace/home/.bash_aliases b/userspace/root/home/comma/.bash_aliases similarity index 100% rename from userspace/home/.bash_aliases rename to userspace/root/home/comma/.bash_aliases diff --git a/userspace/home/.bash_profile b/userspace/root/home/comma/.bash_profile similarity index 100% rename from userspace/home/.bash_profile rename to userspace/root/home/comma/.bash_profile diff --git a/userspace/home/.config/apport/settings b/userspace/root/home/comma/.config/apport/settings similarity index 100% rename from userspace/home/.config/apport/settings rename to userspace/root/home/comma/.config/apport/settings diff --git a/userspace/home/.config/btop/btop.conf b/userspace/root/home/comma/.config/btop/btop.conf similarity index 100% rename from userspace/home/.config/btop/btop.conf rename to userspace/root/home/comma/.config/btop/btop.conf diff --git a/userspace/home/.config/htop/htoprc b/userspace/root/home/comma/.config/htop/htoprc similarity index 100% rename from userspace/home/.config/htop/htoprc rename to userspace/root/home/comma/.config/htop/htoprc diff --git a/userspace/home/.gdbinit b/userspace/root/home/comma/.gdbinit similarity index 100% rename from userspace/home/.gdbinit rename to userspace/root/home/comma/.gdbinit diff --git a/userspace/home/.gitconfig b/userspace/root/home/comma/.gitconfig similarity index 100% rename from userspace/home/.gitconfig rename to userspace/root/home/comma/.gitconfig diff --git a/userspace/home/.gitignore b/userspace/root/home/comma/.gitignore similarity index 100% rename from userspace/home/.gitignore rename to userspace/root/home/comma/.gitignore diff --git a/userspace/home/.sudo_as_admin_successful b/userspace/root/home/comma/.sudo_as_admin_successful similarity index 100% rename from userspace/home/.sudo_as_admin_successful rename to userspace/root/home/comma/.sudo_as_admin_successful diff --git a/userspace/home/.tmux.conf b/userspace/root/home/comma/.tmux.conf similarity index 100% rename from userspace/home/.tmux.conf rename to userspace/root/home/comma/.tmux.conf diff --git a/userspace/home/.vimrc b/userspace/root/home/comma/.vimrc similarity index 100% rename from userspace/home/.vimrc rename to userspace/root/home/comma/.vimrc diff --git a/userspace/firmware/a630_gmu.bin b/userspace/root/lib/firmware/a630_gmu.bin similarity index 100% rename from userspace/firmware/a630_gmu.bin rename to userspace/root/lib/firmware/a630_gmu.bin diff --git a/userspace/firmware/a630_sqe.fw b/userspace/root/lib/firmware/a630_sqe.fw similarity index 100% rename from userspace/firmware/a630_sqe.fw rename to userspace/root/lib/firmware/a630_sqe.fw diff --git a/userspace/firmware/a630_zap.b00 b/userspace/root/lib/firmware/a630_zap.b00 similarity index 100% rename from userspace/firmware/a630_zap.b00 rename to userspace/root/lib/firmware/a630_zap.b00 diff --git a/userspace/firmware/a630_zap.b01 b/userspace/root/lib/firmware/a630_zap.b01 similarity index 100% rename from userspace/firmware/a630_zap.b01 rename to userspace/root/lib/firmware/a630_zap.b01 diff --git a/userspace/firmware/a630_zap.b02 b/userspace/root/lib/firmware/a630_zap.b02 similarity index 100% rename from userspace/firmware/a630_zap.b02 rename to userspace/root/lib/firmware/a630_zap.b02 diff --git a/userspace/firmware/a630_zap.elf b/userspace/root/lib/firmware/a630_zap.elf similarity index 100% rename from userspace/firmware/a630_zap.elf rename to userspace/root/lib/firmware/a630_zap.elf diff --git a/userspace/firmware/a630_zap.mdt b/userspace/root/lib/firmware/a630_zap.mdt similarity index 100% rename from userspace/firmware/a630_zap.mdt rename to userspace/root/lib/firmware/a630_zap.mdt diff --git a/userspace/usr/comma/.gitignore b/userspace/root/usr/comma/.gitignore similarity index 100% rename from userspace/usr/comma/.gitignore rename to userspace/root/usr/comma/.gitignore diff --git a/userspace/usr/comma/adbd b/userspace/root/usr/comma/adbd similarity index 100% rename from userspace/usr/comma/adbd rename to userspace/root/usr/comma/adbd diff --git a/userspace/usr/comma/apt_setup.sh b/userspace/root/usr/comma/apt_setup.sh similarity index 100% rename from userspace/usr/comma/apt_setup.sh rename to userspace/root/usr/comma/apt_setup.sh diff --git a/userspace/usr/comma/apt_teardown.sh b/userspace/root/usr/comma/apt_teardown.sh similarity index 100% rename from userspace/usr/comma/apt_teardown.sh rename to userspace/root/usr/comma/apt_teardown.sh diff --git a/userspace/usr/comma/avahi-publish-service.sh b/userspace/root/usr/comma/avahi-publish-service.sh similarity index 100% rename from userspace/usr/comma/avahi-publish-service.sh rename to userspace/root/usr/comma/avahi-publish-service.sh diff --git a/userspace/usr/comma/bg.jpg b/userspace/root/usr/comma/bg.jpg similarity index 100% rename from userspace/usr/comma/bg.jpg rename to userspace/root/usr/comma/bg.jpg diff --git a/userspace/usr/comma/brightnessd.py b/userspace/root/usr/comma/brightnessd.py similarity index 100% rename from userspace/usr/comma/brightnessd.py rename to userspace/root/usr/comma/brightnessd.py diff --git a/userspace/usr/comma/comma.sh b/userspace/root/usr/comma/comma.sh similarity index 100% rename from userspace/usr/comma/comma.sh rename to userspace/root/usr/comma/comma.sh diff --git a/userspace/usr/comma/debug.py b/userspace/root/usr/comma/debug.py similarity index 100% rename from userspace/usr/comma/debug.py rename to userspace/root/usr/comma/debug.py diff --git a/userspace/usr/comma/fs_setup.sh b/userspace/root/usr/comma/fs_setup.sh similarity index 100% rename from userspace/usr/comma/fs_setup.sh rename to userspace/root/usr/comma/fs_setup.sh diff --git a/userspace/usr/comma/gpio.sh b/userspace/root/usr/comma/gpio.sh similarity index 100% rename from userspace/usr/comma/gpio.sh rename to userspace/root/usr/comma/gpio.sh diff --git a/userspace/usr/comma/init.qcom.sh b/userspace/root/usr/comma/init.qcom.sh similarity index 100% rename from userspace/usr/comma/init.qcom.sh rename to userspace/root/usr/comma/init.qcom.sh diff --git a/userspace/usr/comma/installer b/userspace/root/usr/comma/installer similarity index 100% rename from userspace/usr/comma/installer rename to userspace/root/usr/comma/installer diff --git a/userspace/usr/comma/lte/lte.sh b/userspace/root/usr/comma/lte/lte.sh similarity index 100% rename from userspace/usr/comma/lte/lte.sh rename to userspace/root/usr/comma/lte/lte.sh diff --git a/userspace/usr/comma/magic.py b/userspace/root/usr/comma/magic.py similarity index 100% rename from userspace/usr/comma/magic.py rename to userspace/root/usr/comma/magic.py diff --git a/userspace/usr/comma/modetest b/userspace/root/usr/comma/modetest similarity index 100% rename from userspace/usr/comma/modetest rename to userspace/root/usr/comma/modetest diff --git a/userspace/usr/comma/power_drop_monitor.py b/userspace/root/usr/comma/power_drop_monitor.py similarity index 100% rename from userspace/usr/comma/power_drop_monitor.py rename to userspace/root/usr/comma/power_drop_monitor.py diff --git a/userspace/usr/comma/power_monitor.py b/userspace/root/usr/comma/power_monitor.py similarity index 100% rename from userspace/usr/comma/power_monitor.py rename to userspace/root/usr/comma/power_monitor.py diff --git a/userspace/usr/comma/reset b/userspace/root/usr/comma/reset similarity index 100% rename from userspace/usr/comma/reset rename to userspace/root/usr/comma/reset diff --git a/userspace/usr/comma/screen_calibration.py b/userspace/root/usr/comma/screen_calibration.py similarity index 100% rename from userspace/usr/comma/screen_calibration.py rename to userspace/root/usr/comma/screen_calibration.py diff --git a/userspace/usr/comma/set-hostname.sh b/userspace/root/usr/comma/set-hostname.sh similarity index 100% rename from userspace/usr/comma/set-hostname.sh rename to userspace/root/usr/comma/set-hostname.sh diff --git a/userspace/usr/comma/set_adb.sh b/userspace/root/usr/comma/set_adb.sh similarity index 100% rename from userspace/usr/comma/set_adb.sh rename to userspace/root/usr/comma/set_adb.sh diff --git a/userspace/usr/comma/set_ssh.sh b/userspace/root/usr/comma/set_ssh.sh similarity index 100% rename from userspace/usr/comma/set_ssh.sh rename to userspace/root/usr/comma/set_ssh.sh diff --git a/userspace/usr/comma/setup b/userspace/root/usr/comma/setup similarity index 100% rename from userspace/usr/comma/setup rename to userspace/root/usr/comma/setup diff --git a/userspace/usr/comma/setup_keys b/userspace/root/usr/comma/setup_keys similarity index 100% rename from userspace/usr/comma/setup_keys rename to userspace/root/usr/comma/setup_keys diff --git a/userspace/usr/comma/shims/pip b/userspace/root/usr/comma/shims/pip similarity index 100% rename from userspace/usr/comma/shims/pip rename to userspace/root/usr/comma/shims/pip diff --git a/userspace/usr/comma/shims/pip3 b/userspace/root/usr/comma/shims/pip3 similarity index 100% rename from userspace/usr/comma/shims/pip3 rename to userspace/root/usr/comma/shims/pip3 diff --git a/userspace/usr/comma/shims/uv b/userspace/root/usr/comma/shims/uv similarity index 100% rename from userspace/usr/comma/shims/uv rename to userspace/root/usr/comma/shims/uv diff --git a/userspace/usr/comma/sound/adsp-start.sh b/userspace/root/usr/comma/sound/adsp-start.sh similarity index 100% rename from userspace/usr/comma/sound/adsp-start.sh rename to userspace/root/usr/comma/sound/adsp-start.sh diff --git a/userspace/usr/comma/sound/amplifier.py b/userspace/root/usr/comma/sound/amplifier.py similarity index 100% rename from userspace/usr/comma/sound/amplifier.py rename to userspace/root/usr/comma/sound/amplifier.py diff --git a/userspace/usr/comma/sound/sound_init.sh b/userspace/root/usr/comma/sound/sound_init.sh similarity index 100% rename from userspace/usr/comma/sound/sound_init.sh rename to userspace/root/usr/comma/sound/sound_init.sh diff --git a/userspace/usr/comma/sound/tinymix b/userspace/root/usr/comma/sound/tinymix similarity index 100% rename from userspace/usr/comma/sound/tinymix rename to userspace/root/usr/comma/sound/tinymix diff --git a/userspace/usr/comma/tests/analyze-boot-time.py b/userspace/root/usr/comma/tests/analyze-boot-time.py similarity index 100% rename from userspace/usr/comma/tests/analyze-boot-time.py rename to userspace/root/usr/comma/tests/analyze-boot-time.py diff --git a/userspace/usr/comma/tests/test_agnos.py b/userspace/root/usr/comma/tests/test_agnos.py similarity index 100% rename from userspace/usr/comma/tests/test_agnos.py rename to userspace/root/usr/comma/tests/test_agnos.py diff --git a/userspace/usr/comma/tests/test_modem.py b/userspace/root/usr/comma/tests/test_modem.py similarity index 100% rename from userspace/usr/comma/tests/test_modem.py rename to userspace/root/usr/comma/tests/test_modem.py diff --git a/userspace/usr/comma/tests/test_sounds.py b/userspace/root/usr/comma/tests/test_sounds.py similarity index 100% rename from userspace/usr/comma/tests/test_sounds.py rename to userspace/root/usr/comma/tests/test_sounds.py diff --git a/userspace/usr/comma/tests/varspam.sh b/userspace/root/usr/comma/tests/varspam.sh similarity index 100% rename from userspace/usr/comma/tests/varspam.sh rename to userspace/root/usr/comma/tests/varspam.sh diff --git a/userspace/usr/comma/tests/watch-irqs.sh b/userspace/root/usr/comma/tests/watch-irqs.sh similarity index 100% rename from userspace/usr/comma/tests/watch-irqs.sh rename to userspace/root/usr/comma/tests/watch-irqs.sh diff --git a/userspace/usr/comma/tmpfiles.conf b/userspace/root/usr/comma/tmpfiles.conf similarity index 100% rename from userspace/usr/comma/tmpfiles.conf rename to userspace/root/usr/comma/tmpfiles.conf diff --git a/userspace/usr/comma/updater b/userspace/root/usr/comma/updater similarity index 100% rename from userspace/usr/comma/updater rename to userspace/root/usr/comma/updater diff --git a/userspace/usr/comma/varwatch.py b/userspace/root/usr/comma/varwatch.py similarity index 100% rename from userspace/usr/comma/varwatch.py rename to userspace/root/usr/comma/varwatch.py diff --git a/userspace/usr/comma/wait_for_file.sh b/userspace/root/usr/comma/wait_for_file.sh similarity index 100% rename from userspace/usr/comma/wait_for_file.sh rename to userspace/root/usr/comma/wait_for_file.sh diff --git a/userspace/usr/comma/wlan/bdwlan.b00 b/userspace/root/usr/comma/wlan/bdwlan.b00 similarity index 100% rename from userspace/usr/comma/wlan/bdwlan.b00 rename to userspace/root/usr/comma/wlan/bdwlan.b00 diff --git a/userspace/usr/comma/wlan/bdwlan.b01 b/userspace/root/usr/comma/wlan/bdwlan.b01 similarity index 100% rename from userspace/usr/comma/wlan/bdwlan.b01 rename to userspace/root/usr/comma/wlan/bdwlan.b01 diff --git a/userspace/usr/share/fonts/Inter-Black.woff2 b/userspace/root/usr/share/fonts/Inter-Black.woff2 similarity index 100% rename from userspace/usr/share/fonts/Inter-Black.woff2 rename to userspace/root/usr/share/fonts/Inter-Black.woff2 diff --git a/userspace/usr/share/fonts/Inter-Bold.woff2 b/userspace/root/usr/share/fonts/Inter-Bold.woff2 similarity index 100% rename from userspace/usr/share/fonts/Inter-Bold.woff2 rename to userspace/root/usr/share/fonts/Inter-Bold.woff2 diff --git a/userspace/usr/share/fonts/Inter-ExtraBold.woff2 b/userspace/root/usr/share/fonts/Inter-ExtraBold.woff2 similarity index 100% rename from userspace/usr/share/fonts/Inter-ExtraBold.woff2 rename to userspace/root/usr/share/fonts/Inter-ExtraBold.woff2 diff --git a/userspace/usr/share/fonts/Inter-ExtraLight.woff2 b/userspace/root/usr/share/fonts/Inter-ExtraLight.woff2 similarity index 100% rename from userspace/usr/share/fonts/Inter-ExtraLight.woff2 rename to userspace/root/usr/share/fonts/Inter-ExtraLight.woff2 diff --git a/userspace/usr/share/fonts/Inter-Light.woff2 b/userspace/root/usr/share/fonts/Inter-Light.woff2 similarity index 100% rename from userspace/usr/share/fonts/Inter-Light.woff2 rename to userspace/root/usr/share/fonts/Inter-Light.woff2 diff --git a/userspace/usr/share/fonts/Inter-Medium.woff2 b/userspace/root/usr/share/fonts/Inter-Medium.woff2 similarity index 100% rename from userspace/usr/share/fonts/Inter-Medium.woff2 rename to userspace/root/usr/share/fonts/Inter-Medium.woff2 diff --git a/userspace/usr/share/fonts/Inter-Regular.woff2 b/userspace/root/usr/share/fonts/Inter-Regular.woff2 similarity index 100% rename from userspace/usr/share/fonts/Inter-Regular.woff2 rename to userspace/root/usr/share/fonts/Inter-Regular.woff2 diff --git a/userspace/usr/share/fonts/Inter-SemiBold.woff2 b/userspace/root/usr/share/fonts/Inter-SemiBold.woff2 similarity index 100% rename from userspace/usr/share/fonts/Inter-SemiBold.woff2 rename to userspace/root/usr/share/fonts/Inter-SemiBold.woff2 diff --git a/userspace/usr/share/fonts/Inter-Thin.woff2 b/userspace/root/usr/share/fonts/Inter-Thin.woff2 similarity index 100% rename from userspace/usr/share/fonts/Inter-Thin.woff2 rename to userspace/root/usr/share/fonts/Inter-Thin.woff2 diff --git a/userspace/usr/share/fonts/JetBrainsMono-Bold.woff2 b/userspace/root/usr/share/fonts/JetBrainsMono-Bold.woff2 similarity index 100% rename from userspace/usr/share/fonts/JetBrainsMono-Bold.woff2 rename to userspace/root/usr/share/fonts/JetBrainsMono-Bold.woff2 diff --git a/userspace/usr/share/fonts/JetBrainsMono-ExtraBold.woff2 b/userspace/root/usr/share/fonts/JetBrainsMono-ExtraBold.woff2 similarity index 100% rename from userspace/usr/share/fonts/JetBrainsMono-ExtraBold.woff2 rename to userspace/root/usr/share/fonts/JetBrainsMono-ExtraBold.woff2 diff --git a/userspace/usr/share/fonts/JetBrainsMono-ExtraLight.woff2 b/userspace/root/usr/share/fonts/JetBrainsMono-ExtraLight.woff2 similarity index 100% rename from userspace/usr/share/fonts/JetBrainsMono-ExtraLight.woff2 rename to userspace/root/usr/share/fonts/JetBrainsMono-ExtraLight.woff2 diff --git a/userspace/usr/share/fonts/JetBrainsMono-Light.woff2 b/userspace/root/usr/share/fonts/JetBrainsMono-Light.woff2 similarity index 100% rename from userspace/usr/share/fonts/JetBrainsMono-Light.woff2 rename to userspace/root/usr/share/fonts/JetBrainsMono-Light.woff2 diff --git a/userspace/usr/share/fonts/JetBrainsMono-Medium.woff2 b/userspace/root/usr/share/fonts/JetBrainsMono-Medium.woff2 similarity index 100% rename from userspace/usr/share/fonts/JetBrainsMono-Medium.woff2 rename to userspace/root/usr/share/fonts/JetBrainsMono-Medium.woff2 diff --git a/userspace/usr/share/fonts/JetBrainsMono-Regular.woff2 b/userspace/root/usr/share/fonts/JetBrainsMono-Regular.woff2 similarity index 100% rename from userspace/usr/share/fonts/JetBrainsMono-Regular.woff2 rename to userspace/root/usr/share/fonts/JetBrainsMono-Regular.woff2 diff --git a/userspace/usr/share/fonts/JetBrainsMono-SemiBold.woff2 b/userspace/root/usr/share/fonts/JetBrainsMono-SemiBold.woff2 similarity index 100% rename from userspace/usr/share/fonts/JetBrainsMono-SemiBold.woff2 rename to userspace/root/usr/share/fonts/JetBrainsMono-SemiBold.woff2 diff --git a/userspace/usr/share/fonts/JetBrainsMono-Thin.woff2 b/userspace/root/usr/share/fonts/JetBrainsMono-Thin.woff2 similarity index 100% rename from userspace/usr/share/fonts/JetBrainsMono-Thin.woff2 rename to userspace/root/usr/share/fonts/JetBrainsMono-Thin.woff2 diff --git a/userspace/usr/share/fonts/NotoColorEmoji.woff2 b/userspace/root/usr/share/fonts/NotoColorEmoji.woff2 similarity index 100% rename from userspace/usr/share/fonts/NotoColorEmoji.woff2 rename to userspace/root/usr/share/fonts/NotoColorEmoji.woff2 diff --git a/userspace/usr/share/fonts/NotoSansArabic-Regular.woff2 b/userspace/root/usr/share/fonts/NotoSansArabic-Regular.woff2 similarity index 100% rename from userspace/usr/share/fonts/NotoSansArabic-Regular.woff2 rename to userspace/root/usr/share/fonts/NotoSansArabic-Regular.woff2 diff --git a/userspace/usr/share/fonts/NotoSansDevanagari-Regular.woff2 b/userspace/root/usr/share/fonts/NotoSansDevanagari-Regular.woff2 similarity index 100% rename from userspace/usr/share/fonts/NotoSansDevanagari-Regular.woff2 rename to userspace/root/usr/share/fonts/NotoSansDevanagari-Regular.woff2 diff --git a/userspace/usr/share/fonts/NotoSansJP-Regular.otf b/userspace/root/usr/share/fonts/NotoSansJP-Regular.otf similarity index 100% rename from userspace/usr/share/fonts/NotoSansJP-Regular.otf rename to userspace/root/usr/share/fonts/NotoSansJP-Regular.otf diff --git a/userspace/usr/share/fonts/NotoSansKR-Regular.otf b/userspace/root/usr/share/fonts/NotoSansKR-Regular.otf similarity index 100% rename from userspace/usr/share/fonts/NotoSansKR-Regular.otf rename to userspace/root/usr/share/fonts/NotoSansKR-Regular.otf diff --git a/userspace/usr/share/fonts/NotoSansSC-Regular.otf b/userspace/root/usr/share/fonts/NotoSansSC-Regular.otf similarity index 100% rename from userspace/usr/share/fonts/NotoSansSC-Regular.otf rename to userspace/root/usr/share/fonts/NotoSansSC-Regular.otf diff --git a/userspace/usr/share/fonts/NotoSansTC-Regular.otf b/userspace/root/usr/share/fonts/NotoSansTC-Regular.otf similarity index 100% rename from userspace/usr/share/fonts/NotoSansTC-Regular.otf rename to userspace/root/usr/share/fonts/NotoSansTC-Regular.otf diff --git a/userspace/usr/share/fonts/NotoSansThai-Regular.woff2 b/userspace/root/usr/share/fonts/NotoSansThai-Regular.woff2 similarity index 100% rename from userspace/usr/share/fonts/NotoSansThai-Regular.woff2 rename to userspace/root/usr/share/fonts/NotoSansThai-Regular.woff2 diff --git a/userspace/usr/share/fonts/unifont-13.0.06.woff2 b/userspace/root/usr/share/fonts/unifont-13.0.06.woff2 similarity index 100% rename from userspace/usr/share/fonts/unifont-13.0.06.woff2 rename to userspace/root/usr/share/fonts/unifont-13.0.06.woff2