From d87fe94b8d1b284d334a8328f644dba800fdb8ce Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 18 Oct 2026 22:17:23 -0700 Subject: [PATCH] Move rootfs files into userspace/root overlay (#646) --- .gitattributes | 2 +- .pre-commit-config.yaml | 2 +- Dockerfile.agnos | 63 +++--------------- README.md | 6 +- scripts/setup-on-device.sh | 6 +- userspace/.gitattributes | 14 ++-- .../libeglSubDriverWayland.so.patched | 0 .../etc/NetworkManager}/NetworkManager.conf | 0 .../conf.d}/10-globally-managed-devices.conf | 0 userspace/{files => root/etc/apt}/apt.conf | 0 userspace/{files => root/etc}/fstab | 0 userspace/{ => root}/etc/iptables/rules.v4 | 0 userspace/{files => root/etc}/logrotate.conf | 0 .../{files => root/etc/logrotate.d}/rsyslog | 0 .../etc/polkit-1/rules.d}/comma-polkit.rules | 0 userspace/{files => root/etc}/profile | 0 userspace/{files => root/etc/ssh}/ssh_config | 0 userspace/{files => root/etc/ssh}/sshd_config | 0 .../{files => root/etc/systemd}/logind.conf | 0 .../avahi-daemon.service.d/override.conf} | 0 .../system/polkit.service.d/override.conf} | 0 .../etc/systemd}/timesyncd.conf | 0 .../etc/udev/rules.d}/78-modem.rules | 0 .../etc/udev/rules.d}/92-dsp.rules | 0 .../etc/udev/rules.d}/93-input.rules | 0 .../etc/udev/rules.d}/94-backlight.rules | 0 .../etc/udev/rules.d}/95-gpu.rules | 0 .../etc/udev/rules.d}/96-i2c.rules | 0 .../etc/udev/rules.d}/97-tty.rules | 0 .../etc/udev/rules.d}/98-panda.rules | 0 .../etc/udev/rules.d}/99-gpio.rules | 0 .../{motd => root/etc/update-motd.d}/00-comma | 0 .../etc/update-motd.d}/10-header | 0 .../etc/update-motd.d}/20-quickstart | 0 .../etc/update-motd.d}/30-spacer | 0 .../{home => root/home/comma}/.bash_aliases | 0 .../{home => root/home/comma}/.bash_profile | 0 .../home/comma}/.config/apport/settings | 0 .../home/comma}/.config/btop/btop.conf | 0 .../home/comma}/.config/htop/htoprc | 0 userspace/{home => root/home/comma}/.gdbinit | 0 .../{home => root/home/comma}/.gitconfig | 0 .../{home => root/home/comma}/.gitignore | 0 .../home/comma}/.sudo_as_admin_successful | 0 .../{home => root/home/comma}/.tmux.conf | 0 userspace/{home => root/home/comma}/.vimrc | 0 userspace/{ => root}/usr/comma/.gitignore | 0 userspace/{ => root}/usr/comma/adbd | Bin userspace/{ => root}/usr/comma/apt_setup.sh | 0 .../{ => root}/usr/comma/apt_teardown.sh | 0 .../usr/comma/avahi-publish-service.sh | 0 userspace/{ => root}/usr/comma/bg.png | Bin userspace/{ => root}/usr/comma/brightnessd.py | 0 userspace/{ => root}/usr/comma/comma.sh | 0 userspace/{ => root}/usr/comma/debug.py | 0 userspace/{ => root}/usr/comma/fs_setup.sh | 0 userspace/{ => root}/usr/comma/gpio.sh | 0 userspace/{ => root}/usr/comma/init.qcom.sh | 0 userspace/{ => root}/usr/comma/installer | 0 userspace/{ => root}/usr/comma/lte/lte.sh | 0 userspace/{ => root}/usr/comma/magic.py | 0 userspace/{ => root}/usr/comma/modem.py | 0 .../usr/comma/power_drop_monitor.py | 0 .../{ => root}/usr/comma/power_monitor.py | 0 userspace/{ => root}/usr/comma/reset | 0 .../usr/comma/screen_calibration.py | 0 .../{ => root}/usr/comma/set-hostname.sh | 0 userspace/{ => root}/usr/comma/set_adb.sh | 0 userspace/{ => root}/usr/comma/set_ssh.sh | 0 userspace/{ => root}/usr/comma/setup | 0 userspace/{ => root}/usr/comma/setup_keys | 0 userspace/{ => root}/usr/comma/shims/pip | 0 userspace/{ => root}/usr/comma/shims/pip3 | 0 userspace/{ => root}/usr/comma/shims/uv | 0 .../{ => root}/usr/comma/sound/adsp-start.sh | 0 .../{ => root}/usr/comma/sound/amplifier.py | 0 .../{ => root}/usr/comma/sound/sound_init.sh | 0 userspace/{ => root}/usr/comma/sound/tinymix | Bin .../usr/comma/tests/analyze-boot-time.py | 0 .../{ => root}/usr/comma/tests/test_agnos.py | 0 .../{ => root}/usr/comma/tests/test_modem.py | 0 .../{ => root}/usr/comma/tests/test_sounds.py | 0 .../{ => root}/usr/comma/tests/varspam.sh | 0 .../{ => root}/usr/comma/tests/watch-irqs.sh | 0 userspace/{ => root}/usr/comma/tmpfiles.conf | 0 userspace/{ => root}/usr/comma/updater | 0 userspace/{ => root}/usr/comma/varwatch.py | 0 .../{ => root}/usr/comma/wait_for_file.sh | 0 .../{ => root}/usr/comma/wlan/bdwlan.b00 | Bin .../{ => root}/usr/comma/wlan/bdwlan.b01 | Bin .../usr/lib/aarch64-linux-gnu}/libbase.so.0 | 0 .../lib/aarch64-linux-gnu}/libbase.so.0.0.0 | Bin .../usr/lib/aarch64-linux-gnu}/libcutils.so.0 | 0 .../lib/aarch64-linux-gnu}/libcutils.so.0.0.0 | Bin .../usr/lib/aarch64-linux-gnu}/libgsl.so | Bin .../lib/aarch64-linux-gnu}/libllvm-qcom.so | Bin .../usr/lib/aarch64-linux-gnu}/liblog.so.0 | 0 .../lib/aarch64-linux-gnu}/liblog.so.0.0.0 | Bin .../usr/lib/aarch64-linux-gnu}/libsync.so.0 | 0 .../lib/aarch64-linux-gnu}/libsync.so.0.0.0 | Bin .../usr/lib/aarch64-linux-gnu}/libutils.so.0 | 0 .../lib/aarch64-linux-gnu}/libutils.so.0.0.0 | Bin .../usr/lib/firmware}/CAMERA_ICP.elf | Bin .../{ => root/usr/lib}/firmware/a630_gmu.bin | Bin .../{ => root/usr/lib}/firmware/a630_sqe.fw | Bin .../{ => root/usr/lib}/firmware/a630_zap.b00 | Bin .../{ => root/usr/lib}/firmware/a630_zap.b01 | Bin .../{ => root/usr/lib}/firmware/a630_zap.b02 | Bin .../{ => root/usr/lib}/firmware/a630_zap.elf | Bin .../{ => root/usr/lib}/firmware/a630_zap.mdt | Bin .../firmware}/amdgpu/gc_12_0_0_imu.bin.zst | Bin .../lib/firmware}/amdgpu/gc_12_0_0_me.bin.zst | Bin .../firmware}/amdgpu/gc_12_0_0_mec.bin.zst | Bin .../firmware}/amdgpu/gc_12_0_0_pfp.bin.zst | Bin .../firmware}/amdgpu/gc_12_0_0_rlc.bin.zst | Bin .../firmware}/amdgpu/psp_14_0_2_sos.bin.zst | Bin .../lib/firmware}/amdgpu/sdma_7_0_0.bin.zst | Bin .../lib/firmware}/amdgpu/smu_14_0_2.bin.zst | Bin .../systemd/system}/adb-param-watcher.path | 0 .../systemd/system}/adb-param-watcher.service | 0 .../usr/lib/systemd/system}/adbd.service | 0 .../lib/systemd/system}/agnos-debug.service | 0 .../lib/systemd/system}/agnos-tests.service | 0 .../systemd/system}/avahi-ssh-publish.service | 0 .../lib/systemd/system}/brightnessd.service | 0 .../usr/lib/systemd/system}/cdsp.service | 0 .../usr/lib/systemd/system}/comma.service | 0 .../usr/lib/systemd/system}/fs_setup.service | 0 .../usr/lib/systemd/system}/gpio.service | 0 .../usr/lib/systemd/system}/init-qcom.service | 0 .../systemd/system}/logrotate-hourly.timer | 0 .../usr/lib/systemd/system}/lte.service | 0 .../usr/lib/systemd/system}/magic.service | 0 .../usr/lib/systemd/system}/modem.service | 0 .../system}/power_drop_monitor.service | 0 .../lib/systemd/system}/power_monitor.service | 0 .../system}/screen_calibration.service | 0 .../serial-getty@ttyMSM0_override.conf | 0 .../systemd/system}/serial-hostname.service | 0 .../usr/lib/systemd/system}/sound.service | 0 .../systemd/system}/ssh-param-watcher.path | 0 .../systemd/system}/ssh-param-watcher.service | 0 .../system/ssh.service.d/override.conf} | 0 .../usr/lib/systemd/system}/varwatch.service | 0 .../usr/share/fonts/Inter-Black.woff2 | Bin .../usr/share/fonts/Inter-Bold.woff2 | Bin .../usr/share/fonts/Inter-ExtraBold.woff2 | Bin .../usr/share/fonts/Inter-ExtraLight.woff2 | Bin .../usr/share/fonts/Inter-Light.woff2 | Bin .../usr/share/fonts/Inter-Medium.woff2 | Bin .../usr/share/fonts/Inter-Regular.woff2 | Bin .../usr/share/fonts/Inter-SemiBold.woff2 | Bin .../usr/share/fonts/Inter-Thin.woff2 | Bin .../usr/share/fonts/JetBrainsMono-Bold.woff2 | Bin .../share/fonts/JetBrainsMono-ExtraBold.woff2 | Bin .../fonts/JetBrainsMono-ExtraLight.woff2 | Bin .../usr/share/fonts/JetBrainsMono-Light.woff2 | Bin .../share/fonts/JetBrainsMono-Medium.woff2 | Bin .../share/fonts/JetBrainsMono-Regular.woff2 | Bin .../share/fonts/JetBrainsMono-SemiBold.woff2 | Bin .../usr/share/fonts/JetBrainsMono-Thin.woff2 | Bin .../share/fonts/NotoSansArabic-Regular.woff2 | Bin .../fonts/NotoSansDevanagari-Regular.woff2 | Bin .../usr/share/fonts/NotoSansJP-Regular.woff2 | 0 .../usr/share/fonts/NotoSansKR-Regular.woff2 | 0 .../usr/share/fonts/NotoSansSC-Regular.woff2 | 0 .../usr/share/fonts/NotoSansTC-Regular.woff2 | 0 .../share/fonts/NotoSansThai-Regular.woff2 | Bin .../usr/share/fonts/unifont-13.0.06.woff2 | Bin 169 files changed, 24 insertions(+), 69 deletions(-) rename userspace/{files => graphics}/libeglSubDriverWayland.so.patched (100%) rename userspace/{files => root/etc/NetworkManager}/NetworkManager.conf (100%) rename userspace/{files => root/etc/NetworkManager/conf.d}/10-globally-managed-devices.conf (100%) rename userspace/{files => root/etc/apt}/apt.conf (100%) rename userspace/{files => root/etc}/fstab (100%) rename userspace/{ => root}/etc/iptables/rules.v4 (100%) rename userspace/{files => root/etc}/logrotate.conf (100%) rename userspace/{files => root/etc/logrotate.d}/rsyslog (100%) rename userspace/{files => root/etc/polkit-1/rules.d}/comma-polkit.rules (100%) rename userspace/{files => root/etc}/profile (100%) rename userspace/{files => root/etc/ssh}/ssh_config (100%) rename userspace/{files => root/etc/ssh}/sshd_config (100%) rename userspace/{files => root/etc/systemd}/logind.conf (100%) rename userspace/{files/avahi-override.conf => root/etc/systemd/system/avahi-daemon.service.d/override.conf} (100%) rename userspace/{files/polkit-override.conf => root/etc/systemd/system/polkit.service.d/override.conf} (100%) rename userspace/{files => root/etc/systemd}/timesyncd.conf (100%) rename userspace/{files => root/etc/udev/rules.d}/78-modem.rules (100%) rename userspace/{files => root/etc/udev/rules.d}/92-dsp.rules (100%) rename userspace/{files => root/etc/udev/rules.d}/93-input.rules (100%) rename userspace/{files => root/etc/udev/rules.d}/94-backlight.rules (100%) rename userspace/{files => root/etc/udev/rules.d}/95-gpu.rules (100%) rename userspace/{files => root/etc/udev/rules.d}/96-i2c.rules (100%) rename userspace/{files => root/etc/udev/rules.d}/97-tty.rules (100%) rename userspace/{files => root/etc/udev/rules.d}/98-panda.rules (100%) rename userspace/{files => root/etc/udev/rules.d}/99-gpio.rules (100%) rename userspace/{motd => root/etc/update-motd.d}/00-comma (100%) rename userspace/{motd => root/etc/update-motd.d}/10-header (100%) rename userspace/{motd => root/etc/update-motd.d}/20-quickstart (100%) rename userspace/{motd => root/etc/update-motd.d}/30-spacer (100%) rename userspace/{home => root/home/comma}/.bash_aliases (100%) rename userspace/{home => root/home/comma}/.bash_profile (100%) rename userspace/{home => root/home/comma}/.config/apport/settings (100%) rename userspace/{home => root/home/comma}/.config/btop/btop.conf (100%) rename userspace/{home => root/home/comma}/.config/htop/htoprc (100%) rename userspace/{home => root/home/comma}/.gdbinit (100%) rename userspace/{home => root/home/comma}/.gitconfig (100%) rename userspace/{home => root/home/comma}/.gitignore (100%) rename userspace/{home => root/home/comma}/.sudo_as_admin_successful (100%) rename userspace/{home => root/home/comma}/.tmux.conf (100%) rename userspace/{home => root/home/comma}/.vimrc (100%) rename userspace/{ => root}/usr/comma/.gitignore (100%) rename userspace/{ => root}/usr/comma/adbd (100%) rename userspace/{ => root}/usr/comma/apt_setup.sh (100%) rename userspace/{ => root}/usr/comma/apt_teardown.sh (100%) rename userspace/{ => root}/usr/comma/avahi-publish-service.sh (100%) rename userspace/{ => root}/usr/comma/bg.png (100%) rename userspace/{ => root}/usr/comma/brightnessd.py (100%) rename userspace/{ => root}/usr/comma/comma.sh (100%) rename userspace/{ => root}/usr/comma/debug.py (100%) rename userspace/{ => root}/usr/comma/fs_setup.sh (100%) rename userspace/{ => root}/usr/comma/gpio.sh (100%) rename userspace/{ => root}/usr/comma/init.qcom.sh (100%) rename userspace/{ => root}/usr/comma/installer (100%) rename userspace/{ => root}/usr/comma/lte/lte.sh (100%) rename userspace/{ => root}/usr/comma/magic.py (100%) rename userspace/{ => root}/usr/comma/modem.py (100%) rename userspace/{ => root}/usr/comma/power_drop_monitor.py (100%) rename userspace/{ => root}/usr/comma/power_monitor.py (100%) rename userspace/{ => root}/usr/comma/reset (100%) rename userspace/{ => root}/usr/comma/screen_calibration.py (100%) rename userspace/{ => root}/usr/comma/set-hostname.sh (100%) rename userspace/{ => root}/usr/comma/set_adb.sh (100%) rename userspace/{ => root}/usr/comma/set_ssh.sh (100%) rename userspace/{ => root}/usr/comma/setup (100%) rename userspace/{ => root}/usr/comma/setup_keys (100%) rename userspace/{ => root}/usr/comma/shims/pip (100%) rename userspace/{ => root}/usr/comma/shims/pip3 (100%) rename userspace/{ => root}/usr/comma/shims/uv (100%) rename userspace/{ => root}/usr/comma/sound/adsp-start.sh (100%) rename userspace/{ => root}/usr/comma/sound/amplifier.py (100%) rename userspace/{ => root}/usr/comma/sound/sound_init.sh (100%) rename userspace/{ => root}/usr/comma/sound/tinymix (100%) rename userspace/{ => root}/usr/comma/tests/analyze-boot-time.py (100%) rename userspace/{ => root}/usr/comma/tests/test_agnos.py (100%) rename userspace/{ => root}/usr/comma/tests/test_modem.py (100%) rename userspace/{ => root}/usr/comma/tests/test_sounds.py (100%) rename userspace/{ => root}/usr/comma/tests/varspam.sh (100%) rename userspace/{ => root}/usr/comma/tests/watch-irqs.sh (100%) rename userspace/{ => root}/usr/comma/tmpfiles.conf (100%) rename userspace/{ => root}/usr/comma/updater (100%) rename userspace/{ => root}/usr/comma/varwatch.py (100%) rename userspace/{ => root}/usr/comma/wait_for_file.sh (100%) rename userspace/{ => root}/usr/comma/wlan/bdwlan.b00 (100%) rename userspace/{ => root}/usr/comma/wlan/bdwlan.b01 (100%) rename userspace/{libs => root/usr/lib/aarch64-linux-gnu}/libbase.so.0 (100%) rename userspace/{libs => root/usr/lib/aarch64-linux-gnu}/libbase.so.0.0.0 (100%) rename userspace/{libs => root/usr/lib/aarch64-linux-gnu}/libcutils.so.0 (100%) rename userspace/{libs => root/usr/lib/aarch64-linux-gnu}/libcutils.so.0.0.0 (100%) rename userspace/{libs => root/usr/lib/aarch64-linux-gnu}/libgsl.so (100%) rename userspace/{libs => root/usr/lib/aarch64-linux-gnu}/libllvm-qcom.so (100%) rename userspace/{libs => root/usr/lib/aarch64-linux-gnu}/liblog.so.0 (100%) rename userspace/{libs => root/usr/lib/aarch64-linux-gnu}/liblog.so.0.0.0 (100%) rename userspace/{libs => root/usr/lib/aarch64-linux-gnu}/libsync.so.0 (100%) rename userspace/{libs => root/usr/lib/aarch64-linux-gnu}/libsync.so.0.0.0 (100%) rename userspace/{libs => root/usr/lib/aarch64-linux-gnu}/libutils.so.0 (100%) rename userspace/{libs => root/usr/lib/aarch64-linux-gnu}/libutils.so.0.0.0 (100%) rename userspace/{files => root/usr/lib/firmware}/CAMERA_ICP.elf (100%) rename userspace/{ => root/usr/lib}/firmware/a630_gmu.bin (100%) rename userspace/{ => root/usr/lib}/firmware/a630_sqe.fw (100%) rename userspace/{ => root/usr/lib}/firmware/a630_zap.b00 (100%) rename userspace/{ => root/usr/lib}/firmware/a630_zap.b01 (100%) rename userspace/{ => root/usr/lib}/firmware/a630_zap.b02 (100%) rename userspace/{ => root/usr/lib}/firmware/a630_zap.elf (100%) rename userspace/{ => root/usr/lib}/firmware/a630_zap.mdt (100%) rename userspace/{files => root/usr/lib/firmware}/amdgpu/gc_12_0_0_imu.bin.zst (100%) rename userspace/{files => root/usr/lib/firmware}/amdgpu/gc_12_0_0_me.bin.zst (100%) rename userspace/{files => root/usr/lib/firmware}/amdgpu/gc_12_0_0_mec.bin.zst (100%) rename userspace/{files => root/usr/lib/firmware}/amdgpu/gc_12_0_0_pfp.bin.zst (100%) rename userspace/{files => root/usr/lib/firmware}/amdgpu/gc_12_0_0_rlc.bin.zst (100%) rename userspace/{files => root/usr/lib/firmware}/amdgpu/psp_14_0_2_sos.bin.zst (100%) rename userspace/{files => root/usr/lib/firmware}/amdgpu/sdma_7_0_0.bin.zst (100%) rename userspace/{files => root/usr/lib/firmware}/amdgpu/smu_14_0_2.bin.zst (100%) rename userspace/{files => root/usr/lib/systemd/system}/adb-param-watcher.path (100%) rename userspace/{files => root/usr/lib/systemd/system}/adb-param-watcher.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/adbd.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/agnos-debug.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/agnos-tests.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/avahi-ssh-publish.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/brightnessd.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/cdsp.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/comma.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/fs_setup.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/gpio.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/init-qcom.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/logrotate-hourly.timer (100%) rename userspace/{files => root/usr/lib/systemd/system}/lte.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/magic.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/modem.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/power_drop_monitor.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/power_monitor.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/screen_calibration.service (100%) rename userspace/{files => root/usr/lib/systemd/system/serial-getty@ttyMSM0.service.d}/serial-getty@ttyMSM0_override.conf (100%) rename userspace/{files => root/usr/lib/systemd/system}/serial-hostname.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/sound.service (100%) rename userspace/{files => root/usr/lib/systemd/system}/ssh-param-watcher.path (100%) rename userspace/{files => root/usr/lib/systemd/system}/ssh-param-watcher.service (100%) rename userspace/{files/ssh_override.conf => root/usr/lib/systemd/system/ssh.service.d/override.conf} (100%) rename userspace/{files => root/usr/lib/systemd/system}/varwatch.service (100%) rename userspace/{ => root}/usr/share/fonts/Inter-Black.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/Inter-Bold.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/Inter-ExtraBold.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/Inter-ExtraLight.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/Inter-Light.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/Inter-Medium.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/Inter-Regular.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/Inter-SemiBold.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/Inter-Thin.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/JetBrainsMono-Bold.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/JetBrainsMono-ExtraBold.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/JetBrainsMono-ExtraLight.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/JetBrainsMono-Light.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/JetBrainsMono-Medium.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/JetBrainsMono-Regular.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/JetBrainsMono-SemiBold.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/JetBrainsMono-Thin.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/NotoSansArabic-Regular.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/NotoSansDevanagari-Regular.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/NotoSansJP-Regular.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/NotoSansKR-Regular.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/NotoSansSC-Regular.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/NotoSansTC-Regular.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/NotoSansThai-Regular.woff2 (100%) rename userspace/{ => root}/usr/share/fonts/unifont-13.0.06.woff2 (100%) diff --git a/.gitattributes b/.gitattributes index f780d8a..cb819b6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ *.deb filter=lfs diff=lfs merge=lfs -text *.ko filter=lfs diff=lfs merge=lfs -text userspace/files/sound/tinymix filter=lfs diff=lfs merge=lfs -text -userspace/usr/share/fonts/NotoSans??-Regular.woff2 filter=lfs diff=lfs merge=lfs -text +userspace/root/usr/share/fonts/NotoSans??-Regular.woff2 filter=lfs diff=lfs merge=lfs -text diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 146d4ce..7befcc8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ repos: rev: v4.4.0 hooks: - id: check-ast - exclude: '^(tools)/|(userspace/usr/comma/reset)/|(userspace/usr/comma/updater)' + exclude: '^(tools)/|(userspace/root/usr/comma/reset)/|(userspace/root/usr/comma/updater)' - id: check-toml - id: check-yaml - id: check-merge-conflict diff --git a/Dockerfile.agnos b/Dockerfile.agnos index 0c1abd1..cb5ccdb 100644 --- a/Dockerfile.agnos +++ b/Dockerfile.agnos @@ -26,9 +26,10 @@ FROM agnos-compiler AS agnos-compiler-graphics RUN apt-get update && apt-get install -yq --no-install-recommends patchelf COPY ./userspace/graphics/ /tmp/agnos/graphics-src/ COPY ./userspace/debs/agnos-display_0.0.4.deb /tmp/agnos/ -COPY ./userspace/files/libeglSubDriverWayland.so.patched /tmp/agnos/graphics/libeglSubDriverWayland.so RUN dpkg-deb -x /tmp/agnos/agnos-display_0.0.4.deb /tmp/agnos/display && \ + mkdir -p /tmp/agnos/graphics && \ cp /tmp/agnos/display/usr/lib/aarch64-linux-gnu/libgbm.so /tmp/agnos/graphics/ && \ + cp /tmp/agnos/graphics-src/libeglSubDriverWayland.so.patched /tmp/agnos/graphics/libeglSubDriverWayland.so && \ cd /tmp/agnos/graphics && \ gcc -shared -fPIC -Os -s -Wall -Wextra -Werror -Wl,-z,defs -Wl,-z,relro,-z,now \ -Wl,-soname,libagnos-wayland-stubs.so -o libagnos-wayland-stubs.so /tmp/agnos/graphics-src/stubs.c && \ @@ -75,8 +76,6 @@ RUN /tmp/agnos/openpilot_python_dependencies.sh # ################### # FROM agnos-base -COPY ./userspace/libs/* /usr/lib/aarch64-linux-gnu/ - COPY --from=agnos-compiler-graphics /tmp/agnos/graphics/ /usr/lib/aarch64-linux-gnu/ RUN mv /data/persist /system/ && rm -rf /data/* @@ -114,35 +113,18 @@ 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 +# Root filesystem overlay, all files at their final paths. +# tar keeps the ownership and permissions of existing directories, COPY resets them. +RUN rm -r /etc/update-motd.d/* +RUN --mount=type=bind,source=userspace/root,target=/tmp/agnos/root \ + set -o pipefail && \ + tar -C /tmp/agnos/root --owner=0 --group=0 -cf - . | tar -C / --no-overwrite-dir -xf - +COPY ./userspace/root/home/$USERNAME/.config/ /root/.config RUN chown -R $USERNAME: /home/$USERNAME/.config - -# populate /lib -COPY ./userspace/files/*.path /lib/systemd/system/ -COPY ./userspace/files/*.mount /lib/systemd/system/ -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 -COPY ./userspace/files/profile /etc/profile -COPY ./userspace/files/comma-polkit.rules /etc/polkit-1/rules.d/ -COPY ./userspace/files/*.rules /etc/udev/rules.d/ -COPY ./userspace/files/ssh*_config /etc/ssh/ -COPY ./userspace/files/logrotate.conf /etc/ -COPY ./userspace/files/rsyslog /etc/logrotate.d/ 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 ./output/linux-headers/include/ /usr/include/ -COPY ./userspace/files/amdgpu/ /usr/lib/firmware/amdgpu/ COPY ./userspace/irsc_util.c /tmp/agnos/ RUN gcc -O2 -Wall -Wextra -Werror -o /usr/bin/irsc_util /tmp/agnos/irsc_util.c && rm /tmp/agnos/irsc_util.c @@ -156,36 +138,12 @@ RUN gcc -O2 -o /home/$USERNAME/power_burn_max /tmp/agnos/power_burn_max.c \ COPY ./userspace/services.sh /tmp/agnos RUN /tmp/agnos/services.sh -# MOTD -RUN rm -r /etc/update-motd.d/* -COPY --chown=root:root ./userspace/motd/* /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 -COPY ./userspace/files/NetworkManager.conf /etc/NetworkManager/NetworkManager.conf - # Prefer ipv4 over ipv6 RUN echo "precedence ::ffff:0:0/96 100" >> /etc/gai.conf -# Don't let logind delete /dev/shm -COPY ./userspace/files/logind.conf /etc/systemd/logind.conf - -# Retry NTP sync every 10s instead of 30s for faster time sync after network connects -COPY ./userspace/files/timesyncd.conf /etc/systemd/timesyncd.conf - -# Copy Avahi daemon override -COPY ./userspace/files/avahi-override.conf /etc/systemd/system/avahi-daemon.service.d/override.conf - -# 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 - # Block incoming cellular traffic, including modem.py's PPP interface. # The SDM845 kernel supports xtables, not Ubuntu's default nftables backend. RUN update-alternatives --set iptables /usr/sbin/iptables-legacy -COPY ./userspace/etc/iptables/rules.v4 /etc/iptables/rules.v4 - -# Copy extra FW, rest comes from debs -COPY ./userspace/files/CAMERA_ICP.elf /usr/lib/firmware # Setup hostname resolution for our custom hostname RUN sed -i 's/hosts: files dns myhostname/hosts: files myhostname dns/g' /etc/nsswitch.conf @@ -211,9 +169,6 @@ RUN mkdir -p /tmptmp COPY ./userspace/readonly_setup.sh /tmptmp/readonly_setup.sh RUN /tmptmp/readonly_setup.sh && rm -rf /tmptmp -# copy at the end, after all apt usage -COPY ./userspace/files/apt.conf /etc/apt/apt.conf - # copy version file COPY VERSION /VERSION diff --git a/README.md b/README.md index 156d16b..de6ecdf 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..dabaa5a 100755 --- a/scripts/setup-on-device.sh +++ b/scripts/setup-on-device.sh @@ -14,14 +14,14 @@ 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 +for s in $(ls $ROOT/userspace/root/usr/lib/systemd/system/*.service); do service=$(basename $s) echo "- $service" sudo rm -f /lib/systemd/system/$service - sudo cp $ROOT/userspace/files/$service /lib/systemd/system/ + sudo cp $s /lib/systemd/system/ done sudo $ROOT/userspace/services.sh diff --git a/userspace/.gitattributes b/userspace/.gitattributes index 05a5cc6..ad526fb 100644 --- a/userspace/.gitattributes +++ b/userspace/.gitattributes @@ -1,7 +1,7 @@ -usr/comma/wlan.ko filter=lfs diff=lfs merge=lfs -text -usr/comma/wifi filter=lfs diff=lfs merge=lfs -text -files/libeglSubDriverWayland.so.patched 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 +graphics/libeglSubDriverWayland.so.patched 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/files/libeglSubDriverWayland.so.patched b/userspace/graphics/libeglSubDriverWayland.so.patched similarity index 100% rename from userspace/files/libeglSubDriverWayland.so.patched rename to userspace/graphics/libeglSubDriverWayland.so.patched diff --git a/userspace/files/NetworkManager.conf b/userspace/root/etc/NetworkManager/NetworkManager.conf similarity index 100% rename from userspace/files/NetworkManager.conf rename to userspace/root/etc/NetworkManager/NetworkManager.conf diff --git a/userspace/files/10-globally-managed-devices.conf b/userspace/root/etc/NetworkManager/conf.d/10-globally-managed-devices.conf similarity index 100% rename from userspace/files/10-globally-managed-devices.conf rename to userspace/root/etc/NetworkManager/conf.d/10-globally-managed-devices.conf diff --git a/userspace/files/apt.conf b/userspace/root/etc/apt/apt.conf similarity index 100% rename from userspace/files/apt.conf rename to userspace/root/etc/apt/apt.conf diff --git a/userspace/files/fstab b/userspace/root/etc/fstab similarity index 100% rename from userspace/files/fstab rename to userspace/root/etc/fstab 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/files/logrotate.conf b/userspace/root/etc/logrotate.conf similarity index 100% rename from userspace/files/logrotate.conf rename to userspace/root/etc/logrotate.conf diff --git a/userspace/files/rsyslog b/userspace/root/etc/logrotate.d/rsyslog similarity index 100% rename from userspace/files/rsyslog rename to userspace/root/etc/logrotate.d/rsyslog diff --git a/userspace/files/comma-polkit.rules b/userspace/root/etc/polkit-1/rules.d/comma-polkit.rules similarity index 100% rename from userspace/files/comma-polkit.rules rename to userspace/root/etc/polkit-1/rules.d/comma-polkit.rules diff --git a/userspace/files/profile b/userspace/root/etc/profile similarity index 100% rename from userspace/files/profile rename to userspace/root/etc/profile diff --git a/userspace/files/ssh_config b/userspace/root/etc/ssh/ssh_config similarity index 100% rename from userspace/files/ssh_config rename to userspace/root/etc/ssh/ssh_config diff --git a/userspace/files/sshd_config b/userspace/root/etc/ssh/sshd_config similarity index 100% rename from userspace/files/sshd_config rename to userspace/root/etc/ssh/sshd_config diff --git a/userspace/files/logind.conf b/userspace/root/etc/systemd/logind.conf similarity index 100% rename from userspace/files/logind.conf rename to userspace/root/etc/systemd/logind.conf diff --git a/userspace/files/avahi-override.conf b/userspace/root/etc/systemd/system/avahi-daemon.service.d/override.conf similarity index 100% rename from userspace/files/avahi-override.conf rename to userspace/root/etc/systemd/system/avahi-daemon.service.d/override.conf diff --git a/userspace/files/polkit-override.conf b/userspace/root/etc/systemd/system/polkit.service.d/override.conf similarity index 100% rename from userspace/files/polkit-override.conf rename to userspace/root/etc/systemd/system/polkit.service.d/override.conf diff --git a/userspace/files/timesyncd.conf b/userspace/root/etc/systemd/timesyncd.conf similarity index 100% rename from userspace/files/timesyncd.conf rename to userspace/root/etc/systemd/timesyncd.conf diff --git a/userspace/files/78-modem.rules b/userspace/root/etc/udev/rules.d/78-modem.rules similarity index 100% rename from userspace/files/78-modem.rules rename to userspace/root/etc/udev/rules.d/78-modem.rules diff --git a/userspace/files/92-dsp.rules b/userspace/root/etc/udev/rules.d/92-dsp.rules similarity index 100% rename from userspace/files/92-dsp.rules rename to userspace/root/etc/udev/rules.d/92-dsp.rules diff --git a/userspace/files/93-input.rules b/userspace/root/etc/udev/rules.d/93-input.rules similarity index 100% rename from userspace/files/93-input.rules rename to userspace/root/etc/udev/rules.d/93-input.rules diff --git a/userspace/files/94-backlight.rules b/userspace/root/etc/udev/rules.d/94-backlight.rules similarity index 100% rename from userspace/files/94-backlight.rules rename to userspace/root/etc/udev/rules.d/94-backlight.rules diff --git a/userspace/files/95-gpu.rules b/userspace/root/etc/udev/rules.d/95-gpu.rules similarity index 100% rename from userspace/files/95-gpu.rules rename to userspace/root/etc/udev/rules.d/95-gpu.rules diff --git a/userspace/files/96-i2c.rules b/userspace/root/etc/udev/rules.d/96-i2c.rules similarity index 100% rename from userspace/files/96-i2c.rules rename to userspace/root/etc/udev/rules.d/96-i2c.rules diff --git a/userspace/files/97-tty.rules b/userspace/root/etc/udev/rules.d/97-tty.rules similarity index 100% rename from userspace/files/97-tty.rules rename to userspace/root/etc/udev/rules.d/97-tty.rules diff --git a/userspace/files/98-panda.rules b/userspace/root/etc/udev/rules.d/98-panda.rules similarity index 100% rename from userspace/files/98-panda.rules rename to userspace/root/etc/udev/rules.d/98-panda.rules diff --git a/userspace/files/99-gpio.rules b/userspace/root/etc/udev/rules.d/99-gpio.rules similarity index 100% rename from userspace/files/99-gpio.rules rename to userspace/root/etc/udev/rules.d/99-gpio.rules 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/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.png b/userspace/root/usr/comma/bg.png similarity index 100% rename from userspace/usr/comma/bg.png rename to userspace/root/usr/comma/bg.png 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/modem.py b/userspace/root/usr/comma/modem.py similarity index 100% rename from userspace/usr/comma/modem.py rename to userspace/root/usr/comma/modem.py 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/libs/libbase.so.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libbase.so.0 similarity index 100% rename from userspace/libs/libbase.so.0 rename to userspace/root/usr/lib/aarch64-linux-gnu/libbase.so.0 diff --git a/userspace/libs/libbase.so.0.0.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libbase.so.0.0.0 similarity index 100% rename from userspace/libs/libbase.so.0.0.0 rename to userspace/root/usr/lib/aarch64-linux-gnu/libbase.so.0.0.0 diff --git a/userspace/libs/libcutils.so.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libcutils.so.0 similarity index 100% rename from userspace/libs/libcutils.so.0 rename to userspace/root/usr/lib/aarch64-linux-gnu/libcutils.so.0 diff --git a/userspace/libs/libcutils.so.0.0.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libcutils.so.0.0.0 similarity index 100% rename from userspace/libs/libcutils.so.0.0.0 rename to userspace/root/usr/lib/aarch64-linux-gnu/libcutils.so.0.0.0 diff --git a/userspace/libs/libgsl.so b/userspace/root/usr/lib/aarch64-linux-gnu/libgsl.so similarity index 100% rename from userspace/libs/libgsl.so rename to userspace/root/usr/lib/aarch64-linux-gnu/libgsl.so diff --git a/userspace/libs/libllvm-qcom.so b/userspace/root/usr/lib/aarch64-linux-gnu/libllvm-qcom.so similarity index 100% rename from userspace/libs/libllvm-qcom.so rename to userspace/root/usr/lib/aarch64-linux-gnu/libllvm-qcom.so diff --git a/userspace/libs/liblog.so.0 b/userspace/root/usr/lib/aarch64-linux-gnu/liblog.so.0 similarity index 100% rename from userspace/libs/liblog.so.0 rename to userspace/root/usr/lib/aarch64-linux-gnu/liblog.so.0 diff --git a/userspace/libs/liblog.so.0.0.0 b/userspace/root/usr/lib/aarch64-linux-gnu/liblog.so.0.0.0 similarity index 100% rename from userspace/libs/liblog.so.0.0.0 rename to userspace/root/usr/lib/aarch64-linux-gnu/liblog.so.0.0.0 diff --git a/userspace/libs/libsync.so.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libsync.so.0 similarity index 100% rename from userspace/libs/libsync.so.0 rename to userspace/root/usr/lib/aarch64-linux-gnu/libsync.so.0 diff --git a/userspace/libs/libsync.so.0.0.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libsync.so.0.0.0 similarity index 100% rename from userspace/libs/libsync.so.0.0.0 rename to userspace/root/usr/lib/aarch64-linux-gnu/libsync.so.0.0.0 diff --git a/userspace/libs/libutils.so.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libutils.so.0 similarity index 100% rename from userspace/libs/libutils.so.0 rename to userspace/root/usr/lib/aarch64-linux-gnu/libutils.so.0 diff --git a/userspace/libs/libutils.so.0.0.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libutils.so.0.0.0 similarity index 100% rename from userspace/libs/libutils.so.0.0.0 rename to userspace/root/usr/lib/aarch64-linux-gnu/libutils.so.0.0.0 diff --git a/userspace/files/CAMERA_ICP.elf b/userspace/root/usr/lib/firmware/CAMERA_ICP.elf similarity index 100% rename from userspace/files/CAMERA_ICP.elf rename to userspace/root/usr/lib/firmware/CAMERA_ICP.elf diff --git a/userspace/firmware/a630_gmu.bin b/userspace/root/usr/lib/firmware/a630_gmu.bin similarity index 100% rename from userspace/firmware/a630_gmu.bin rename to userspace/root/usr/lib/firmware/a630_gmu.bin diff --git a/userspace/firmware/a630_sqe.fw b/userspace/root/usr/lib/firmware/a630_sqe.fw similarity index 100% rename from userspace/firmware/a630_sqe.fw rename to userspace/root/usr/lib/firmware/a630_sqe.fw diff --git a/userspace/firmware/a630_zap.b00 b/userspace/root/usr/lib/firmware/a630_zap.b00 similarity index 100% rename from userspace/firmware/a630_zap.b00 rename to userspace/root/usr/lib/firmware/a630_zap.b00 diff --git a/userspace/firmware/a630_zap.b01 b/userspace/root/usr/lib/firmware/a630_zap.b01 similarity index 100% rename from userspace/firmware/a630_zap.b01 rename to userspace/root/usr/lib/firmware/a630_zap.b01 diff --git a/userspace/firmware/a630_zap.b02 b/userspace/root/usr/lib/firmware/a630_zap.b02 similarity index 100% rename from userspace/firmware/a630_zap.b02 rename to userspace/root/usr/lib/firmware/a630_zap.b02 diff --git a/userspace/firmware/a630_zap.elf b/userspace/root/usr/lib/firmware/a630_zap.elf similarity index 100% rename from userspace/firmware/a630_zap.elf rename to userspace/root/usr/lib/firmware/a630_zap.elf diff --git a/userspace/firmware/a630_zap.mdt b/userspace/root/usr/lib/firmware/a630_zap.mdt similarity index 100% rename from userspace/firmware/a630_zap.mdt rename to userspace/root/usr/lib/firmware/a630_zap.mdt diff --git a/userspace/files/amdgpu/gc_12_0_0_imu.bin.zst b/userspace/root/usr/lib/firmware/amdgpu/gc_12_0_0_imu.bin.zst similarity index 100% rename from userspace/files/amdgpu/gc_12_0_0_imu.bin.zst rename to userspace/root/usr/lib/firmware/amdgpu/gc_12_0_0_imu.bin.zst diff --git a/userspace/files/amdgpu/gc_12_0_0_me.bin.zst b/userspace/root/usr/lib/firmware/amdgpu/gc_12_0_0_me.bin.zst similarity index 100% rename from userspace/files/amdgpu/gc_12_0_0_me.bin.zst rename to userspace/root/usr/lib/firmware/amdgpu/gc_12_0_0_me.bin.zst diff --git a/userspace/files/amdgpu/gc_12_0_0_mec.bin.zst b/userspace/root/usr/lib/firmware/amdgpu/gc_12_0_0_mec.bin.zst similarity index 100% rename from userspace/files/amdgpu/gc_12_0_0_mec.bin.zst rename to userspace/root/usr/lib/firmware/amdgpu/gc_12_0_0_mec.bin.zst diff --git a/userspace/files/amdgpu/gc_12_0_0_pfp.bin.zst b/userspace/root/usr/lib/firmware/amdgpu/gc_12_0_0_pfp.bin.zst similarity index 100% rename from userspace/files/amdgpu/gc_12_0_0_pfp.bin.zst rename to userspace/root/usr/lib/firmware/amdgpu/gc_12_0_0_pfp.bin.zst diff --git a/userspace/files/amdgpu/gc_12_0_0_rlc.bin.zst b/userspace/root/usr/lib/firmware/amdgpu/gc_12_0_0_rlc.bin.zst similarity index 100% rename from userspace/files/amdgpu/gc_12_0_0_rlc.bin.zst rename to userspace/root/usr/lib/firmware/amdgpu/gc_12_0_0_rlc.bin.zst diff --git a/userspace/files/amdgpu/psp_14_0_2_sos.bin.zst b/userspace/root/usr/lib/firmware/amdgpu/psp_14_0_2_sos.bin.zst similarity index 100% rename from userspace/files/amdgpu/psp_14_0_2_sos.bin.zst rename to userspace/root/usr/lib/firmware/amdgpu/psp_14_0_2_sos.bin.zst diff --git a/userspace/files/amdgpu/sdma_7_0_0.bin.zst b/userspace/root/usr/lib/firmware/amdgpu/sdma_7_0_0.bin.zst similarity index 100% rename from userspace/files/amdgpu/sdma_7_0_0.bin.zst rename to userspace/root/usr/lib/firmware/amdgpu/sdma_7_0_0.bin.zst diff --git a/userspace/files/amdgpu/smu_14_0_2.bin.zst b/userspace/root/usr/lib/firmware/amdgpu/smu_14_0_2.bin.zst similarity index 100% rename from userspace/files/amdgpu/smu_14_0_2.bin.zst rename to userspace/root/usr/lib/firmware/amdgpu/smu_14_0_2.bin.zst diff --git a/userspace/files/adb-param-watcher.path b/userspace/root/usr/lib/systemd/system/adb-param-watcher.path similarity index 100% rename from userspace/files/adb-param-watcher.path rename to userspace/root/usr/lib/systemd/system/adb-param-watcher.path diff --git a/userspace/files/adb-param-watcher.service b/userspace/root/usr/lib/systemd/system/adb-param-watcher.service similarity index 100% rename from userspace/files/adb-param-watcher.service rename to userspace/root/usr/lib/systemd/system/adb-param-watcher.service diff --git a/userspace/files/adbd.service b/userspace/root/usr/lib/systemd/system/adbd.service similarity index 100% rename from userspace/files/adbd.service rename to userspace/root/usr/lib/systemd/system/adbd.service diff --git a/userspace/files/agnos-debug.service b/userspace/root/usr/lib/systemd/system/agnos-debug.service similarity index 100% rename from userspace/files/agnos-debug.service rename to userspace/root/usr/lib/systemd/system/agnos-debug.service diff --git a/userspace/files/agnos-tests.service b/userspace/root/usr/lib/systemd/system/agnos-tests.service similarity index 100% rename from userspace/files/agnos-tests.service rename to userspace/root/usr/lib/systemd/system/agnos-tests.service diff --git a/userspace/files/avahi-ssh-publish.service b/userspace/root/usr/lib/systemd/system/avahi-ssh-publish.service similarity index 100% rename from userspace/files/avahi-ssh-publish.service rename to userspace/root/usr/lib/systemd/system/avahi-ssh-publish.service diff --git a/userspace/files/brightnessd.service b/userspace/root/usr/lib/systemd/system/brightnessd.service similarity index 100% rename from userspace/files/brightnessd.service rename to userspace/root/usr/lib/systemd/system/brightnessd.service diff --git a/userspace/files/cdsp.service b/userspace/root/usr/lib/systemd/system/cdsp.service similarity index 100% rename from userspace/files/cdsp.service rename to userspace/root/usr/lib/systemd/system/cdsp.service diff --git a/userspace/files/comma.service b/userspace/root/usr/lib/systemd/system/comma.service similarity index 100% rename from userspace/files/comma.service rename to userspace/root/usr/lib/systemd/system/comma.service diff --git a/userspace/files/fs_setup.service b/userspace/root/usr/lib/systemd/system/fs_setup.service similarity index 100% rename from userspace/files/fs_setup.service rename to userspace/root/usr/lib/systemd/system/fs_setup.service diff --git a/userspace/files/gpio.service b/userspace/root/usr/lib/systemd/system/gpio.service similarity index 100% rename from userspace/files/gpio.service rename to userspace/root/usr/lib/systemd/system/gpio.service diff --git a/userspace/files/init-qcom.service b/userspace/root/usr/lib/systemd/system/init-qcom.service similarity index 100% rename from userspace/files/init-qcom.service rename to userspace/root/usr/lib/systemd/system/init-qcom.service diff --git a/userspace/files/logrotate-hourly.timer b/userspace/root/usr/lib/systemd/system/logrotate-hourly.timer similarity index 100% rename from userspace/files/logrotate-hourly.timer rename to userspace/root/usr/lib/systemd/system/logrotate-hourly.timer diff --git a/userspace/files/lte.service b/userspace/root/usr/lib/systemd/system/lte.service similarity index 100% rename from userspace/files/lte.service rename to userspace/root/usr/lib/systemd/system/lte.service diff --git a/userspace/files/magic.service b/userspace/root/usr/lib/systemd/system/magic.service similarity index 100% rename from userspace/files/magic.service rename to userspace/root/usr/lib/systemd/system/magic.service diff --git a/userspace/files/modem.service b/userspace/root/usr/lib/systemd/system/modem.service similarity index 100% rename from userspace/files/modem.service rename to userspace/root/usr/lib/systemd/system/modem.service diff --git a/userspace/files/power_drop_monitor.service b/userspace/root/usr/lib/systemd/system/power_drop_monitor.service similarity index 100% rename from userspace/files/power_drop_monitor.service rename to userspace/root/usr/lib/systemd/system/power_drop_monitor.service diff --git a/userspace/files/power_monitor.service b/userspace/root/usr/lib/systemd/system/power_monitor.service similarity index 100% rename from userspace/files/power_monitor.service rename to userspace/root/usr/lib/systemd/system/power_monitor.service diff --git a/userspace/files/screen_calibration.service b/userspace/root/usr/lib/systemd/system/screen_calibration.service similarity index 100% rename from userspace/files/screen_calibration.service rename to userspace/root/usr/lib/systemd/system/screen_calibration.service diff --git a/userspace/files/serial-getty@ttyMSM0_override.conf b/userspace/root/usr/lib/systemd/system/serial-getty@ttyMSM0.service.d/serial-getty@ttyMSM0_override.conf similarity index 100% rename from userspace/files/serial-getty@ttyMSM0_override.conf rename to userspace/root/usr/lib/systemd/system/serial-getty@ttyMSM0.service.d/serial-getty@ttyMSM0_override.conf diff --git a/userspace/files/serial-hostname.service b/userspace/root/usr/lib/systemd/system/serial-hostname.service similarity index 100% rename from userspace/files/serial-hostname.service rename to userspace/root/usr/lib/systemd/system/serial-hostname.service diff --git a/userspace/files/sound.service b/userspace/root/usr/lib/systemd/system/sound.service similarity index 100% rename from userspace/files/sound.service rename to userspace/root/usr/lib/systemd/system/sound.service diff --git a/userspace/files/ssh-param-watcher.path b/userspace/root/usr/lib/systemd/system/ssh-param-watcher.path similarity index 100% rename from userspace/files/ssh-param-watcher.path rename to userspace/root/usr/lib/systemd/system/ssh-param-watcher.path diff --git a/userspace/files/ssh-param-watcher.service b/userspace/root/usr/lib/systemd/system/ssh-param-watcher.service similarity index 100% rename from userspace/files/ssh-param-watcher.service rename to userspace/root/usr/lib/systemd/system/ssh-param-watcher.service diff --git a/userspace/files/ssh_override.conf b/userspace/root/usr/lib/systemd/system/ssh.service.d/override.conf similarity index 100% rename from userspace/files/ssh_override.conf rename to userspace/root/usr/lib/systemd/system/ssh.service.d/override.conf diff --git a/userspace/files/varwatch.service b/userspace/root/usr/lib/systemd/system/varwatch.service similarity index 100% rename from userspace/files/varwatch.service rename to userspace/root/usr/lib/systemd/system/varwatch.service 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/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.woff2 b/userspace/root/usr/share/fonts/NotoSansJP-Regular.woff2 similarity index 100% rename from userspace/usr/share/fonts/NotoSansJP-Regular.woff2 rename to userspace/root/usr/share/fonts/NotoSansJP-Regular.woff2 diff --git a/userspace/usr/share/fonts/NotoSansKR-Regular.woff2 b/userspace/root/usr/share/fonts/NotoSansKR-Regular.woff2 similarity index 100% rename from userspace/usr/share/fonts/NotoSansKR-Regular.woff2 rename to userspace/root/usr/share/fonts/NotoSansKR-Regular.woff2 diff --git a/userspace/usr/share/fonts/NotoSansSC-Regular.woff2 b/userspace/root/usr/share/fonts/NotoSansSC-Regular.woff2 similarity index 100% rename from userspace/usr/share/fonts/NotoSansSC-Regular.woff2 rename to userspace/root/usr/share/fonts/NotoSansSC-Regular.woff2 diff --git a/userspace/usr/share/fonts/NotoSansTC-Regular.woff2 b/userspace/root/usr/share/fonts/NotoSansTC-Regular.woff2 similarity index 100% rename from userspace/usr/share/fonts/NotoSansTC-Regular.woff2 rename to userspace/root/usr/share/fonts/NotoSansTC-Regular.woff2 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