Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing the /usr merge #3691

Closed
Tracked by #293
silkeh opened this issue Aug 29, 2024 · 49 comments
Closed
Tracked by #293

Testing the /usr merge #3691

silkeh opened this issue Aug 29, 2024 · 49 comments
Labels
Priority: High High priority
Milestone

Comments

@silkeh
Copy link
Member

silkeh commented Aug 29, 2024

This issue tracks the testing phase of the /usr merge (#293). Read on if you are brave enough to potentially brick your system.

Testing the /usr merge

It is possible to opt-in to test the /usr merge. Before doing so, take note of the following:

  • The requisite packages are available on stable and unstable, but it is recommended to use unstable for testing.
  • For users on stable only the python3 version of eopkg (eopkg.bin) will work. Regular eopkg or Software Centre might break your system. All package managers support the usr-merge.
  • Ensure you have proper backups. While we're fairly sure that nothing should break, this is not guaranteed at this point.
  • While the /usr merge is an exciting step for Solus, it is also very boring. You should notice absolutely no differences in how your system works after performing it.

Opt-in by editing /etc/sysconfig/usr-merge with the following value:

USR_MERGE_CHANCE=256

Your system will be merged on the next reboot. To see if the process succeeded, you can check:

  • systemctl status usr-merge, which should include code=exited, status=0/SUCCESS.
  • ls -l /, which should include the following (with different timestamps):
    lrwxrwxrwx   1 root root    7 25 aug 14:52 bin -> usr/bin
    lrwxrwxrwx   1 root root    7 25 aug 14:52 lib -> usr/lib
    lrwxrwxrwx   1 root root    9 25 aug 14:52 lib32 -> usr/lib32
    lrwxrwxrwx   1 root root    9 25 aug 14:52 lib64 -> usr/lib64
    lrwxrwxrwx   1 root root    8 25 aug 14:52 sbin -> usr/sbin
    

Please report the following:

  • The output of systemctl status usr-merge --lines=0
  • The output of systemd-analyze blame | grep usr-merge
  • The output of find /var/solus/usr-merge
  • The output of ls -l /bin /lib /lib32 /lib64 /sbin
@TraceyC77
Copy link
Contributor

Testing on a VM on unstable that was last updated 25-April was not successful

  • Opted-in to the /usr merge and rebooted
  • Ran an update with eopkg.bin

The process was not successful

~ ❯❯❯ systemctl status usr-merge
Unit usr-merge.service could not be found.

~ ❯❯❯ ls -l / |rg "bin|lib"
drwxr-xr-x   2 root root  4096 Sep  3 20:53 bin
lrwxrwxrwx   1 root root     5 Sep  3 20:49 lib -> lib64
drwxr-xr-x   2 root root  4096 Sep  3 20:52 lib32
drwxr-xr-x   5 root root  4096 Sep  3 20:53 lib64
drwxr-xr-x   2 root root  4096 Sep  3 20:54 sbin

~ ❯❯❯ systemd-analyze blame | grep usr-merge
~ ❯❯❯       

~ ❯❯❯ ls -l /var/solus/usr-merge/orphaned-files                                                                         ✘ 1 
ls: cannot access '/var/solus/usr-merge/orphaned-files': No such file or directory

Disabled local repo.
Fixed broken packages, did

@silkeh
Copy link
Member Author

silkeh commented Sep 4, 2024

@TraceyC77 this is still blocked by #3670. Your system will merge when that has landed in unstable. I've updated the issue description to reflect this.

@silkeh
Copy link
Member Author

silkeh commented Sep 4, 2024

This can now be tested on unstable! (edit: and on stable if you feel particularly adventurous)

@JTCPingas
Copy link

Test results on GNOME desktop

  • Output of systemd-analyze blame | grep usr-merge 48.715s usr-merge.service
  • Output of ls -l /var/solus/usr-merge/orphaned-files ls: cannot access '/var/solus/usr-merge/orphaned-files': No such file or directory

@silkeh silkeh added this to the Solus 4.6 milestone Sep 8, 2024
@malfisya
Copy link
Member

Just tested usr-merge script on my machine. It works flawlessly

$ systemd-analyze blame | grep usr-merge                                                                                                                    
1.423s usr-merge.service

$ ls -l /var/solus/usr-merge/orphaned-files                                                                                                                 
ls: cannot access '/var/solus/usr-merge/orphaned-files': No such file or directory

@aquilapl
Copy link
Contributor

Desktop Budgie Stable

systemd-analyze blame | grep usr-merge  
40ms usr-merge.service

ls -l /var/solus/usr-merge/orphaned-files
ls: cannot access '/var/solus/usr-merge/orphaned-files': No such file or directory

@androidnisse
Copy link
Contributor

Well it seemed to failed for me. This is on Budgie stable.


× usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; disabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: failed (Result: exit-code) since Tue 2024-09-10 08:05:07 CEST; 1min 24s ago
    Process: 656 ExecStart=/usr/lib64/usysconf/usr-merge.sh (code=exited, status=1/FAILURE)
   Main PID: 656 (code=exited, status=1/FAILURE)
        CPU: 117ms

sep 10 08:05:07 vesslan usr-merge.sh[656]: [/lib64/modules/6.10.6-300.current/modules.alias]: moving special file to /usr/lib64/modules/6.10.6-300.current/modules.alias
sep 10 08:05:07 vesslan usr-merge.sh[656]: [/lib64/modules/6.10.6-300.current/modules.alias]: creating compatibility symlink to /usr/lib64/modules/6.10.6-300.current/modules.alias
sep 10 08:05:07 vesslan usr-merge.sh[656]: [/lib64/modules/6.10.6-300.current/modules.alias.bin]: moving special file to /usr/lib64/modules/6.10.6-300.current/modules.alias.bin
sep 10 08:05:07 vesslan usr-merge.sh[656]: [/lib64/modules/6.10.6-300.current/modules.alias.bin]: creating compatibility symlink to /usr/lib64/modules/6.10.6-300.current/modules.alias.bin
sep 10 08:05:07 vesslan usr-merge.sh[656]: [/lib64/modules/6.10.6-300.current/modules.softdep]: creating compatibility symlink to /usr/lib64/modules/6.10.6-300.current/modules.softdep
sep 10 08:05:07 vesslan usr-merge.sh[744]: /usr/bin/sha256sum: /var/solus/usr-merge/orphaned-files/root-lib64-modules-6.10.6-300.current-modules.symbols.20d30db178728be7bfe956de655e9980a1e061c4df9a19d6f5a862030c5>
sep 10 08:05:07 vesslan usr-merge.sh[743]: /usr/lib64/usysconf/usr-merge.sh: line 88: file_checksum[0]: unbound variable
sep 10 08:05:07 vesslan systemd[1]: usr-merge.service: Main process exited, code=exited, status=1/FAILURE
sep 10 08:05:07 vesslan systemd[1]: usr-merge.service: Failed with result 'exit-code'.
sep 10 08:05:07 vesslan systemd[1]: Failed to start usr-merge.service - Perform the usr-merge.

ls -l /

total 12
lrwxrwxrwx   1 root root    7 14 maj 16.39 bin -> usr/bin
drwxr-xr-x   1 root root    8  1 jun 06.33 boot
drwxr-xr-x  21 root root 4340 10 sep 08.05 dev
drwxr-xr-x   1 root root 1548  7 sep 15.57 etc
drwxr-xr-x   1 root root   10 13 maj 19.35 home
lrwxrwxrwx   1 root root    5 14 maj 16.39 lib -> lib64
drwxr-xr-x   1 root root   26  7 sep 15.57 lib32
drwxr-xr-x   1 root root  134  7 sep 15.57 lib64
drwx------   1 root root    0  8 jan  2024 lost+found
drwxr-xr-x   1 root root    0 13 maj 19.35 media
drwxr-xr-x   1 root root    0 14 feb  2024 mnt
drwxr-xr-x   1 root root   22 15 feb  2024 node_modules_20
dr-xr-xr-x 386 root root    0 10 sep 08.05 proc
drwxr-xr-x   1 root root  170 10 sep 08.07 root
drwxr-xr-x  33 root root  780 10 sep 08.05 run
lrwxrwxrwx   1 root root    8 14 maj 16.39 sbin -> usr/sbin
drwxr-xr-x   1 root root   12 13 jul 08.16 snap
drwxr-xr-x   1 root root    0  8 jan  2024 srv
dr-xr-xr-x  12 root root    0 10 sep 08.07 sys
drwxrwxrwt  26 root root  660 10 sep 08.10 tmp
drwxr-xr-x   1 root root   90 19 jul  2022 usr
drwxr-xr-x   1 root root  116  7 sep 15.56 var

systemd-analyze blame | grep usr-merge
198ms usr-merge.service

ls -l /var/solus/usr-merge/orphaned-files
total 0

@ermo
Copy link
Contributor

ermo commented Sep 10, 2024

Successfully completed usr-merge on my KDE workstation (and symlinks look correct):

ermo@solbox:~
$ sudo systemd-analyze blame | grep usr-merge
 819ms usr-merge.service
ermo@solbox:~
$ ls -l /var/solus/usr-merge/orphaned-files
ls: cannot access '/var/solus/usr-merge/orphaned-files': No such file or directory

@ermo
Copy link
Contributor

ermo commented Sep 10, 2024

Well it seemed to failed for me. This is on Budgie stable.


× usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; disabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: failed (Result: exit-code) since Tue 2024-09-10 08:05:07 CEST; 1min 24s ago
    Process: 656 ExecStart=/usr/lib64/usysconf/usr-merge.sh (code=exited, status=1/FAILURE)
   Main PID: 656 (code=exited, status=1/FAILURE)
        CPU: 117ms

sep 10 08:05:07 vesslan usr-merge.sh[656]: [/lib64/modules/6.10.6-300.current/modules.alias]: moving special file to /usr/lib64/modules/6.10.6-300.current/modules.alias
sep 10 08:05:07 vesslan usr-merge.sh[656]: [/lib64/modules/6.10.6-300.current/modules.alias]: creating compatibility symlink to /usr/lib64/modules/6.10.6-300.current/modules.alias
sep 10 08:05:07 vesslan usr-merge.sh[656]: [/lib64/modules/6.10.6-300.current/modules.alias.bin]: moving special file to /usr/lib64/modules/6.10.6-300.current/modules.alias.bin
sep 10 08:05:07 vesslan usr-merge.sh[656]: [/lib64/modules/6.10.6-300.current/modules.alias.bin]: creating compatibility symlink to /usr/lib64/modules/6.10.6-300.current/modules.alias.bin
sep 10 08:05:07 vesslan usr-merge.sh[656]: [/lib64/modules/6.10.6-300.current/modules.softdep]: creating compatibility symlink to /usr/lib64/modules/6.10.6-300.current/modules.softdep
sep 10 08:05:07 vesslan usr-merge.sh[744]: /usr/bin/sha256sum: /var/solus/usr-merge/orphaned-files/root-lib64-modules-6.10.6-300.current-modules.symbols.20d30db178728be7bfe956de655e9980a1e061c4df9a19d6f5a862030c5>
sep 10 08:05:07 vesslan usr-merge.sh[743]: /usr/lib64/usysconf/usr-merge.sh: line 88: file_checksum[0]: unbound variable
sep 10 08:05:07 vesslan systemd[1]: usr-merge.service: Main process exited, code=exited, status=1/FAILURE
sep 10 08:05:07 vesslan systemd[1]: usr-merge.service: Failed with result 'exit-code'.
sep 10 08:05:07 vesslan systemd[1]: Failed to start usr-merge.service - Perform the usr-merge.

@androidnisse :

Any chance you could paste the entire line related to the sha256sum command that fails?

It appears to be truncated in the above output...

@soos162
Copy link

soos162 commented Sep 10, 2024

systemd-analyze blame | grep usr-merge
4ms usr-merge.service

ls -l /var/solus/usr-merge/orphaned-files
ls: no se puede acceder a '/var/solus/usr-merge/orphaned-files': No existe el fichero o el directorio

@AlphaElwedritsch
Copy link

Successfully on Plasma (repo: unstable)

mkl@mkl:~
$ sudo systemd-analyze blame | grep usr-merge
974ms usr-merge.service
mkl@mkl:~
$ ls -l /var/solus/usr-merge/orphaned-files
ls: cannot access '/var/solus/usr-merge/orphaned-files': No such file or directory

@androidnisse
Copy link
Contributor

Well it seemed to failed for me. This is on Budgie stable.


× usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; disabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: failed (Result: exit-code) since Tue 2024-09-10 08:05:07 CEST; 1min 24s ago
    Process: 656 ExecStart=/usr/lib64/usysconf/usr-merge.sh (code=exited, status=1/FAILURE)
   Main PID: 656 (code=exited, status=1/FAILURE)
        CPU: 117ms

sep 10 08:05:07 vesslan usr-merge.sh[656]: [/lib64/modules/6.10.6-300.current/modules.alias]: moving special file to /usr/lib64/modules/6.10.6-300.current/modules.alias
sep 10 08:05:07 vesslan usr-merge.sh[656]: [/lib64/modules/6.10.6-300.current/modules.alias]: creating compatibility symlink to /usr/lib64/modules/6.10.6-300.current/modules.alias
sep 10 08:05:07 vesslan usr-merge.sh[656]: [/lib64/modules/6.10.6-300.current/modules.alias.bin]: moving special file to /usr/lib64/modules/6.10.6-300.current/modules.alias.bin
sep 10 08:05:07 vesslan usr-merge.sh[656]: [/lib64/modules/6.10.6-300.current/modules.alias.bin]: creating compatibility symlink to /usr/lib64/modules/6.10.6-300.current/modules.alias.bin
sep 10 08:05:07 vesslan usr-merge.sh[656]: [/lib64/modules/6.10.6-300.current/modules.softdep]: creating compatibility symlink to /usr/lib64/modules/6.10.6-300.current/modules.softdep
sep 10 08:05:07 vesslan usr-merge.sh[744]: /usr/bin/sha256sum: /var/solus/usr-merge/orphaned-files/root-lib64-modules-6.10.6-300.current-modules.symbols.20d30db178728be7bfe956de655e9980a1e061c4df9a19d6f5a862030c5>
sep 10 08:05:07 vesslan usr-merge.sh[743]: /usr/lib64/usysconf/usr-merge.sh: line 88: file_checksum[0]: unbound variable
sep 10 08:05:07 vesslan systemd[1]: usr-merge.service: Main process exited, code=exited, status=1/FAILURE
sep 10 08:05:07 vesslan systemd[1]: usr-merge.service: Failed with result 'exit-code'.
sep 10 08:05:07 vesslan systemd[1]: Failed to start usr-merge.service - Perform the usr-merge.

@androidnisse :

Any chance you could paste the entire line related to the sha256sum command that fails?

It appears to be truncated in the above output...

Here it is
sep 10 08:05:07 vesslan usr-merge.sh[744]: /usr/bin/sha256sum: /var/solus/usr-merge/orphaned-files/root-lib64-modules-6.10.6-300.current-modules.symbols.20d30db178728be7bfe956de655e9980a1e061c4df9a19d6f5a862030c5ef5d5: No such file or directory

@Staudey
Copy link
Member

Staudey commented Sep 10, 2024

It kinda seems like it just attached the sha256sum to the filename and then tried to sha256sum that'

My bad, seems that is what it's supposed to do, from a quick glance at the script

@Staudey
Copy link
Member

Staudey commented Sep 10, 2024

Shouldn't this be a if [[ -f "$new_file_name" ]]; then

if [[ "$new_file_name" ]]; then

@ermo
Copy link
Contributor

ermo commented Sep 10, 2024

Shouldn't this be a if [[ -f "$new_file_name" ]]; then

if [[ "$new_file_name" ]]; then

@silkeh ^

I'm afraid that this error was carried over from my bash porting gist. 😬

@silkeh
Copy link
Member Author

silkeh commented Sep 10, 2024

@androidnisse: looks like you actually found two issues with one action, nice! Fixed version should be available on unstable momentarily.

@silkeh
Copy link
Member Author

silkeh commented Sep 10, 2024

@aquilapl, @soos162: the process completed suspiciously fast on your machines. Can you check if the process succeeded using the commands described in the issue?

@aquilapl
Copy link
Contributor

So add -f to line 281? And reboot?

@silkeh
Copy link
Member Author

silkeh commented Sep 10, 2024

@aquilapl: No, I'm mainly wondering if the usr-merge service actually did anything on your machine. What's the output of:

  • sudo systemctl status usr-merge --no-pager
  • ls -l /

@aquilapl
Copy link
Contributor

Ok.

 $ sudo systemctl status usr-merge --no-pager
[sudo] password for aquila:
● usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; enabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: active (exited) since Tue 2024-09-10 19:34:40 CEST; 42min ago
    Process: 565 ExecStart=/usr/lib64/usysconf/usr-merge.sh (code=exited, status=0/SUCCESS)
   Main PID: 565 (code=exited, status=0/SUCCESS)
        CPU: 14ms

wrz 10 19:34:40 solus systemd[1]: Starting usr-merge.service - Perform the u…ge...
wrz 10 19:34:40 solus systemd[1]: Finished usr-merge.service - Perform the u…erge.
Hint: Some lines were ellipsized, use -l to show in full.
$ ls -l /
razem 84
drwxrwxrwx   4 root root  4096 09-09 02:57 arch
drwxr-xr-x   2 root root  4096 09-10 10:03 bin
drwxr-xr-x   2 root root  4096 04-29 13:48 boot
drwxr-xr-x  21 root root  4160 09-10 19:34 dev
drwxr-xr-x  56 root root  4096 09-10 17:57 etc
drwxr-xr-x   4 root root  4096 04-29 13:48 home
lrwxrwxrwx   1 root root     5 09-09 03:26 lib -> lib64
drwxr-xr-x   2 root root  4096 09-09 03:42 lib32
drwxr-xr-x   6 root root  4096 09-09 03:42 lib64
drwx------   2 root root 16384 2024-01-08  lost+found
drwxr-xr-x   2 root root  4096 04-29 13:48 media
drwxr-xr-x   2 root root  4096 09-09 03:19 mnt
drwxr-xr-x   3 root root  4096 09-09 03:58 opt
dr-xr-xr-x 323 root root     0 09-10 19:34 proc
drwxr-xr-x   8 root root  4096 09-09 08:53 root
drwxr-xr-x  34 root root   800 09-10 19:59 run
drwxr-xr-x   2 root root  4096 09-09 03:32 sbin
drwxr-xr-x   2 root root  4096 09-09 04:17 snap
drwxr-xr-x   2 root root  4096 2024-01-08  sof-ipc4-tplg
drwxr-xr-x   2 root root  4096 2024-01-08  srv
dr-xr-xr-x  12 root root     0 09-10 19:34 sys
drwxrwxrwt  24 root root   600 09-10 20:18 tmp
drwxr-xr-x  12 root root  4096 09-09 04:10 usr
drwxr-xr-x  12 root root  4096 09-09 04:17 var

@silkeh
Copy link
Member Author

silkeh commented Sep 10, 2024

@aquilapl and what's the output of the following commands?

  • cat /etc/sysconfig/usr-merge
  • find /var/solus/

@aquilapl
Copy link
Contributor

$ cat /etc/sysconfig/usr-merge
cat: /etc/sysconfig/usr-merge: Nie ma takiego pliku ani katalogu
$ find /var/solus/
/var/solus/
/var/solus/usr-merge
/var/solus/usr-merge/eopkg-ready

@silkeh
Copy link
Member Author

silkeh commented Sep 10, 2024

Ah, you need to edit /etc/sysconfig/usr-merge to opt in to the usr-merge. See the description of this issue for details on how to do that. However, I would recommend you wait until more people on unstable have found all the bugs and the fixed script is available in stable. I'll let you know when that's the case!

@aquilapl
Copy link
Contributor

I don't know if I understood correctly, but I created the file /etc/sysconfig/usr-merge and added USR_MERGE_CHANCE=256

$ sudo systemctl status usr-merge --no-pager
[sudo] password for aquila:
● usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; enabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: active (exited) since Tue 2024-09-10 21:38:35 CEST; 47s ago
    Process: 566 ExecStart=/usr/lib64/usysconf/usr-merge.sh (code=exited, status=0/SUCCESS)
   Main PID: 566 (code=exited, status=0/SUCCESS)
      Tasks: 2 (limit: 9155)
     Memory: 126.1M
        CPU: 1min 28.793s
     CGroup: /system.slice/usr-merge.service
             ├─570 /usr/bin/bash /usr/lib64/usysconf/usr-merge.sh
             └─573 sleep 530

wrz 10 21:38:35 solus usr-merge.sh[47100]: drwxr-xr-x  30 root root   680 09-10 21:37 run
wrz 10 21:38:35 solus usr-merge.sh[47100]: lrwxrwxrwx   1 root root     8 09-10 21:37 sbin -> usr/sbin
wrz 10 21:38:35 solus usr-merge.sh[47100]: drwxr-xr-x   2 root root  4096 09-09 04:17 snap
wrz 10 21:38:35 solus usr-merge.sh[47100]: drwxr-xr-x   2 root root  4096 2024-01-08  sof-ipc4-tplg
wrz 10 21:38:35 solus usr-merge.sh[47100]: drwxr-xr-x   2 root root  4096 2024-01-08  srv
wrz 10 21:38:35 solus usr-merge.sh[47100]: dr-xr-xr-x  12 root root     0 09-10 21:37 sys
wrz 10 21:38:35 solus usr-merge.sh[47100]: drwxrwxrwt   8 root root   160 09-10 21:37 tmp
wrz 10 21:38:35 solus usr-merge.sh[47100]: drwxr-xr-x  12 root root  4096 09-09 04:10 usr
wrz 10 21:38:35 solus usr-merge.sh[47100]: drwxr-xr-x  12 root root  4096 09-09 04:17 var
wrz 10 21:38:35 solus systemd[1]: Finished usr-merge.service - Perform the usr-merge.
 ~ $ ls -l /
razem 68
drwxrwxrwx   4 root root  4096 09-09 02:57 arch
lrwxrwxrwx   1 root root     7 09-10 21:37 bin -> usr/bin
drwxr-xr-x   2 root root  4096 04-29 13:48 boot
drwxr-xr-x  21 root root  4160 09-10 21:38 dev
drwxr-xr-x  56 root root  4096 09-10 17:57 etc
drwxr-xr-x   4 root root  4096 04-29 13:48 home
lrwxrwxrwx   1 root root     7 09-10 21:38 lib -> usr/lib
lrwxrwxrwx   1 root root     9 09-10 21:38 lib32 -> usr/lib32
lrwxrwxrwx   1 root root     9 09-10 21:38 lib64 -> usr/lib64
drwx------   2 root root 16384 2024-01-08  lost+found
drwxr-xr-x   2 root root  4096 04-29 13:48 media
drwxr-xr-x   2 root root  4096 09-09 03:19 mnt
drwxr-xr-x   3 root root  4096 09-09 03:58 opt
dr-xr-xr-x 300 root root     0 09-10 21:37 proc
drwxr-xr-x   8 root root  4096 09-09 08:53 root
drwxr-xr-x  33 root root   780 09-10 21:38 run
lrwxrwxrwx   1 root root     8 09-10 21:37 sbin -> usr/sbin
drwxr-xr-x   2 root root  4096 09-09 04:17 snap
drwxr-xr-x   2 root root  4096 2024-01-08  sof-ipc4-tplg
drwxr-xr-x   2 root root  4096 2024-01-08  srv
dr-xr-xr-x  12 root root     0 09-10 21:38 sys
drwxrwxrwt  21 root root   500 09-10 21:39 tmp
drwxr-xr-x  12 root root  4096 09-09 04:10 usr
drwxr-xr-x  12 root root  4096 09-09 04:17 var
 $ find /var/solus/
/var/solus/
/var/solus/usr-merge
/var/solus/usr-merge/eopkg-ready
/var/solus/usr-merge/merge-complete

@silkeh
Copy link
Member Author

silkeh commented Sep 10, 2024

@aquilapl that looks good!

@brent111
Copy link

brent111 commented Sep 10, 2024

$ systemd-analyze blame | grep usr-merge
 4.660s usr-merge.service
~ $ ls -l /var/solus/usr-merge/orphaned-files
ls: cannot access '/var/solus/usr-merge/orphaned-files': No such file or directory
$ find /var/solus/
/var/solus/
/var/solus/usr-merge
/var/solus/usr-merge/merge-complete
/var/solus/usr-merge/eopkg-ready

Budgie. And apparently passed (?). Edit: I have one of those 'suspiciously fast' times, too.
If I did pass, do I/should I opt out and delete /etc/sysconfig/usr-merge?

@ermo
Copy link
Contributor

ermo commented Sep 10, 2024

@brent111

4.something seconds is not "suspiciously fast"; anything under ~100 ms is "suspiciously fast" in this context, inasmuch as it implies that something made the script abort.

For reference, on fast NVMe 4x4 storage and a decent-ish 5900X CPU, my system took around a full second to complete the /usr/ merge. On a different, older system w/ SATA-600 SSD, it took around 30s because I had some stray kernel versions lying around for some odd reason.

I suspect that most people with SSDs and decent CPUs will see times in the 1-10s range for a successful merge on "normal" installs, but time will tell I suppose.

@brent111
Copy link

@brent111

4.something seconds is not "suspiciously fast"; anything under ~100 ms is "suspiciously fast" in this context, inasmuch as it implies that something made the script abort.

For reference, on fast NVMe 4x4 storage and a decent-ish 5900X CPU, my system took around a full second to complete the /usr/ merge. On a different, older system w/ SATA-600 SSD, it took around 30s because I had some stray kernel versions lying around for some odd reason.

I suspect that most people with SSDs and decent CPUs will see times in the 1-10s range for a successful merge on "normal" installs, but time will tell I suppose.

thank you. all makes sense. appreciate the context.

@presianbg
Copy link

systemctl status usr-merge --lines=0

● usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; disabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: active (exited) since Thu 2024-09-12 13:13:51 EEST; 1min 31s ago
    Process: 750 ExecStart=/usr/lib64/usysconf/usr-merge.sh (code=exited, status=0/SUCCESS)
   Main PID: 750 (code=exited, status=0/SUCCESS)
      Tasks: 2 (limit: 37472)
     Memory: 147.9M
        CPU: 38.175s
     CGroup: /system.slice/usr-merge.service
             ├─752 /usr/bin/bash /usr/lib64/usysconf/usr-merge.sh
             └─754 sleep 530

systemd-analyze blame | grep usr-merge

37.679s usr-merge.service

find /var/solus/usr-merge

/var/solus/usr-merge
/var/solus/usr-merge/eopkg-ready
/var/solus/usr-merge/merge-complete

ls -l /bin /lib /lib32 /lib64 /sbin

lrwxrwxrwx 1 root root 7 May 14 07:36 /bin -> usr/bin
lrwxrwxrwx 1 root root 7 Sep 12 13:13 /lib -> usr/lib
lrwxrwxrwx 1 root root 9 Sep 12 13:13 /lib32 -> usr/lib32
lrwxrwxrwx 1 root root 9 Sep 12 13:13 /lib64 -> usr/lib64
lrwxrwxrwx 1 root root 8 May 14 07:36 /sbin -> usr/sbin

repo: shanon (aka stable)

The system seems to be operational after the merge. I got lost and confused regarding if I have to switch to unstable now or it's fine to stay on stable ?

Cheers,
PY

@silkeh
Copy link
Member Author

silkeh commented Sep 12, 2024

The system seems to be operational after the merge. I got lost and confused regarding if I have to switch to unstable now or it's fine to stay on stable ?

It's fine to stay on stable, but you should use eopkg.bin for updating if you do.

@silkeh
Copy link
Member Author

silkeh commented Sep 13, 2024

The latest version of eopkg and the usr-merge script were included in the sync. This means that it should be safe to usr-merge on stable and use whatever method of updating you want.

@brent111
Copy link

The latest version of eopkg and the usr-merge script were included in the sync. This means that it should be safe to usr-merge on stable and use whatever method of updating you want.

should we get rid of the file we created (/etc/sysconfig/usr-merge) and/or it's text (USR_MERGE_CHANCE=256) or does it matter?

@androidnisse
Copy link
Contributor

I would say it worked for me now.

usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; disabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: active (exited) since Sat 2024-09-14 07:22:51 CEST; 2min 27s ago
    Process: 670 ExecStart=/usr/lib64/usysconf/usr-merge.sh (code=exited, status=0/SUCCESS)
   Main PID: 670 (code=exited, status=0/SUCCESS)
      Tasks: 2 (limit: 18571)
     Memory: 29.8M
        CPU: 605ms
     CGroup: /system.slice/usr-merge.service
             ├─675 /usr/bin/bash /usr/lib64/usysconf/usr-merge.sh
             └─677 sleep 530

718ms usr-merge.service

/var/solus/usr-merge
/var/solus/usr-merge/orphaned-files
/var/solus/usr-merge/orphaned-files/root-lib64-modules-6.10.8-301.current-modules.symbols.20d30db178728be7bfe956de655e9980a1e061c4df9a19d6f5a862030c5ef5d5
/var/solus/usr-merge/orphaned-files/root-lib64-modules-6.10.9-302.current-modules.symbols.396a894448b31c0245c00e2cee5bded7032f26d0a99822c7db4665f8c88c7f13
/var/solus/usr-merge/eopkg-ready
/var/solus/usr-merge/merge-complete
lrwxrwxrwx 1 root root 7 14 maj 16.39 /bin -> usr/bin
lrwxrwxrwx 1 root root 7 14 sep 07.22 /lib -> usr/lib
lrwxrwxrwx 1 root root 9 14 sep 07.22 /lib32 -> usr/lib32
lrwxrwxrwx 1 root root 9 14 sep 07.22 /lib64 -> usr/lib64
lrwxrwxrwx 1 root root 8 14 maj 16.39 /sbin -> usr/sbin

@silkeh
Copy link
Member Author

silkeh commented Sep 14, 2024

@brent111 you can safely delete the file.

@androidnisse thanks, that looks a lot better! Still some files that probably shouldn't have been orphaned. I've created a PR with updated patterns (#3828). You can remove /var/solus/usr-merge/orphaned-files to get rid of the cruft.

@feroxday
Copy link

I think it worked ok.

usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; disabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: active (exited) since Sun 2024-09-15 15:07:45 CDT; 3min 20s ago
    Process: 924 ExecStart=/usr/lib64/usysconf/usr-merge.sh (code=exited, status=0/SUCCESS)
   Main PID: 924 (code=exited, status=0/SUCCESS)
      Tasks: 2 (limit: 38224)
     Memory: 96.2M
        CPU: 2min 23.523s
     CGroup: /system.slice/usr-merge.service
             ├─926 /usr/bin/bash /usr/lib64/usysconf/usr-merge.sh
             └─929 sleep 530

ls -l /var/solus/usr-merge/orphaned-files
ls: cannot access '/var/solus/usr-merge/orphaned-files': No such file or directory

@Staudey
Copy link
Member

Staudey commented Sep 15, 2024

I had some issues with the usr-merge. I turned on my PC, walked to the kitchen and back, and just saw the display turning off. I waited a while because it seemed to be working on something, but when it didn't react after a while I shut it off (and I didn't think about the usr-merge scenario). When I turned it on again I saw the start of the usr-merge script output for a split second before the display shut off again. I let it work for a while and finally the display turned on again and I was at my login screen. This is with an NVIDIA GPU and the proprietary drivers (nvidia-beta-driver)

Output of the suggested commands (note that does will refer to the second boot though, since I switched it off after a while the first time):

λ sudo systemctl status usr-merge          
● usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; disabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: active (exited) since Sun 2024-09-15 17:14:29 CEST; 7h ago
    Process: 691 ExecStart=/usr/lib64/usysconf/usr-merge.sh (code=exited, status=0/SUCCESS)
   Main PID: 691 (code=exited, status=0/SUCCESS)
      Tasks: 0 (limit: 38323)
     Memory: 56.8M
        CPU: 28.367s
     CGroup: /system.slice/usr-merge.service

Sep 15 17:14:29 solus-pc usr-merge.sh[8830]: drwxr-xr-x  15 root root  4096 May 17 00:49 root
Sep 15 17:14:29 solus-pc usr-merge.sh[8830]: drwxr-xr-x  33 root root   740 Sep 15 17:14 run
Sep 15 17:14:29 solus-pc usr-merge.sh[8830]: lrwxrwxrwx   1 root root     8 May 15 00:33 sbin -> usr/sbin
Sep 15 17:14:29 solus-pc usr-merge.sh[8830]: drwxr-xr-x   2 root root  4096 Sep 20  2018 srv
Sep 15 17:14:29 solus-pc usr-merge.sh[8830]: dr-xr-xr-x  12 root root     0 Sep 15  2024 sys
Sep 15 17:14:29 solus-pc usr-merge.sh[8830]: drwxrwxrwt   8 root root   160 Sep 15 17:14 tmp
Sep 15 17:14:29 solus-pc usr-merge.sh[8830]: drwxr-xr-x  14 root root  4096 May 15 00:33 usr
Sep 15 17:14:29 solus-pc usr-merge.sh[8830]: drwxr-xr-x  16 root root  4096 Sep 15 00:25 var
Sep 15 17:14:29 solus-pc usr-merge.sh[8830]: lrwxrwxrwx   1 root root    41 Sep 12 22:03 vmlinuz -> boot/com.solus-project.current.6.10.9-302
Sep 15 17:14:29 solus-pc systemd[1]: Finished usr-merge.service - Perform the usr-merge.
λ systemd-analyze blame | grep usr-merge
27.718s usr-merge.service
λ find /var/solus/usr-merge
/var/solus/usr-merge
/var/solus/usr-merge/eopkg-ready
/var/solus/usr-merge/merge-complete
/var/solus/usr-merge/orphaned-files
/var/solus/usr-merge/orphaned-files/root-lib64-os-release.ec9d2de5f89176aad4bbb8cdb3677382ad577594fbac16275a1b1827e70d7c43
λ ls -l /bin /lib /lib32 /lib64 /sbin
lrwxrwxrwx 1 root root 7 May 15 00:33 /bin -> usr/bin
lrwxrwxrwx 1 root root 7 Sep 15 17:14 /lib -> usr/lib
lrwxrwxrwx 1 root root 9 Sep 15 17:14 /lib32 -> usr/lib32
lrwxrwxrwx 1 root root 9 Sep 15 17:14 /lib64 -> usr/lib64
lrwxrwxrwx 1 root root 8 May 15 00:33 /sbin -> usr/sbin

@TraceyC77
Copy link
Contributor

TraceyC77 commented Sep 16, 2024

My system did the usr-merge upon reboot this morning. It was successful.

❯ systemctl status usr-merge --lines=0
● usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; disabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: active (exited) since Mon 2024-09-16 08:24:22 CDT; 2h 1min ago
   Main PID: 919 (code=exited, status=0/SUCCESS)
      Tasks: 0 (limit: 76635)
     Memory: 212.0M
        CPU: 52.086s
     CGroup: /system.slice/usr-merge.service
❯ systemd-analyze blame | grep usr-merge
51.333s usr-merge.service
❯ find /var/solus/usr-merge
/var/solus/usr-merge
/var/solus/usr-merge/merge-complete
/var/solus/usr-merge/eopkg-ready
❯ ls -l /bin /lib /lib32 /lib64 /sbin
lrwxrwxrwx 1 root root 7 May 14 13:00 /bin -> usr/bin
lrwxrwxrwx 1 root root 7 Sep 16 08:24 /lib -> usr/lib
lrwxrwxrwx 1 root root 9 Sep 16 08:24 /lib32 -> usr/lib32
lrwxrwxrwx 1 root root 9 Sep 16 08:24 /lib64 -> usr/lib64
lrwxrwxrwx 1 root root 8 May 14 13:00 /sbin -> usr/sbin
❯ ls -l /var/solus/usr-merge/orphaned-files
ls: cannot access '/var/solus/usr-merge/orphaned-files': No such file or directory

I didn't see the screen shut off like Staudey did, this system also has an nVidia GPU
Could that be firmware / hardware settings related?

@infinitymdm
Copy link
Contributor

infinitymdm commented Sep 19, 2024

Works on my machine

marcus@summit ~ $ systemctl status usr-merge --lines=0
● usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; disabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: active (exited) since Wed 2024-09-18 21:23:21 CDT; 5s left
    Process: 655 ExecStart=/usr/lib64/usysconf/usr-merge.sh (code=exited, status=0/SUCCESS)
   Main PID: 655 (code=exited, status=0/SUCCESS)
        CPU: 2ms
marcus@summit ~ $ systemd-analyze blame | grep usr-merge
   2ms usr-merge.service
marcus@summit ~ $ find /var/solus/usr-merge
/var/solus/usr-merge
/var/solus/usr-merge/eopkg-ready
/var/solus/usr-merge/merge-complete
marcus@summit ~ $ ls -l /bin /lib /lib32 /lib64 /sbin
lrwxrwxrwx 1 root root 7 May 14 21:52 /bin -> usr/bin
lrwxrwxrwx 1 root root 7 Sep 17 20:11 /lib -> usr/lib
lrwxrwxrwx 1 root root 9 Sep 17 20:11 /lib32 -> usr/lib32
lrwxrwxrwx 1 root root 9 Sep 17 20:11 /lib64 -> usr/lib64
lrwxrwxrwx 1 root root 8 May 14 21:52 /sbin -> usr/sbin

EDIT: Actually, after scrolling through the comments here, ermo might call this "suspiciously fast". Anything I need to be concerned about? Lmk if I can provide any helpful info.

@silkeh
Copy link
Member Author

silkeh commented Sep 20, 2024

I had some issues with the usr-merge. I turned on my PC, walked to the kitchen and back, and just saw the display turning off. I waited a while because it seemed to be working on something, but when it didn't react after a while I shut it off (and I didn't think about the usr-merge scenario). When I turned it on again I saw the start of the usr-merge script output for a split second before the display shut off again. I let it work for a while and finally the display turned on again and I was at my login screen. This is with an NVIDIA GPU and the proprietary drivers (nvidia-beta-driver)

Strange. This is not what is supposed to happen. Good to see it completed successfully in the end though.

Could that be firmware / hardware settings related?

This would be my guess.

Actually, after scrolling through the comments here, ermo might call this "suspiciously fast". Anything I need to be concerned about? Lmk if I can provide any helpful info.

Yeah, that's suspiciously fast. The output looks like the merge was completed successfully though. Maybe it happened in an earlier boot?

@infinitymdm
Copy link
Contributor

Maybe it happened in an earlier boot?

I set up /etc/sysconfig/usr-merge and immediately rebooted, so I'm not sure how that could have been the case. Is there a chance that my system somehow went through the usr-merge process previously, without me manually opting in?

@HarveyDevel
Copy link
Member

Is there a chance that my system somehow went through the usr-merge process previously, without me manually opting in?

If you are on the unstable repository, it had a 100% chance this week before being lowered to 10% for sync.

@infinitymdm
Copy link
Contributor

Ah, that would be it then. Sorry for making a fuss!

@ermo
Copy link
Contributor

ermo commented Sep 22, 2024

Maybe it happened in an earlier boot?

I set up /etc/sysconfig/usr-merge and immediately rebooted, so I'm not sure how that could have been the case. Is there a chance that my system somehow went through the usr-merge process previously, without me manually opting in?

Some people actually had their systems almost (or fully!) /usr-merged back in May (so prior to the current process). Looking at the time stamps in your fs listing, this appears to be the case for you?

The current process is designed to bring over both everyone who ended up on a semi-completed /usr-merge system as well as those who held back updating while we mitigated the worst of the disaster back in May.

Taken in concert with Harvey's comments, the end result is that, if you updated on unstable last week, you would have had your (by the looks of it) partly usr-merged system fully merged via the usr-merge script we are rolling out.

And since it was partly merged, the script didn't have to do a lot of work to complete the merge, hence the "suspiciously short" run time. =)

@Staudey
Copy link
Member

Staudey commented Sep 25, 2024

Worked fine on my MATE laptop. Only thing I'm wondering is whether the missing lib32 thing could be a problem if some package that has files in that folder got installed in the mean time? (ignore the mate-vm machine name, it's bare metal, but muscle memory compelled me to choose that name when I set up the machine)

thomas@mate-vm ~ $ systemctl status u sr-merge --lines=0
● usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; disabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: active (exited) since Thu 2024-09-26 00:30:56 CEST; 6min ago
    Process: 541 ExecStart=/usr/lib64/usysconf/usr-merge.sh (code=exited, status=0/SUCCESS)
   Main PID: 541 (code=exited, status=0/SUCCESS)
      Tasks: 2 (limit: 9295)
     Memory: 152.8M
        CPU: 1min 38.363s
     CGroup: /system.slice/usr-merge.service
             ├─548 /usr/bin/bash /usr/lib64/usysconf/usr-merge.sh
             └─550 sleep 530
thomas@mate-vm ~ $ systemd-analyze blame | grep usr-merge
1min 36.130s usr-merge.service
thomas@mate-vm ~ $ find /var/solus/usr-merge
/var/solus/usr-merge
/var/solus/usr-merge/merge-complete
/var/solus/usr-merge/eopkg-ready
thomas@mate-vm ~ $ ls -l /bin /lib /lib32 /lib64 /sbin
ls: cannot access '/lib32': No such file or directory
lrwxrwxrwx 1 root root 7 May 15 21:38 /bin -> usr/bin
lrwxrwxrwx 1 root root 7 Sep 26 00:30 /lib -> usr/lib
lrwxrwxrwx 1 root root 9 Sep 26 00:30 /lib64 -> usr/lib64
lrwxrwxrwx 1 root root 8 May 15 21:38 /sbin -> usr/sbin

@silkeh silkeh added the Priority: High High priority label Sep 27, 2024
@silkeh silkeh moved this from Triage to In Progress in Solus Sep 27, 2024
@pjolt
Copy link

pjolt commented Oct 1, 2024

Added USR_MERGE_CHANCE=256 to /etc/sysconfig/usr-merge on stable/shannon and rebooted

pjol@solus-mini ~ $ systemctl status usr-merge.service --lines=0
● usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; disabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: active (exited) since Tue 2024-10-01 18:05:45 CEST; 5min ago
    Process: 664 ExecStart=/usr/lib64/usysconf/usr-merge.sh (code=exited, status=0/SUCCESS)
   Main PID: 664 (code=exited, status=0/SUCCESS)
      Tasks: 2 (limit: 28479)
     Memory: 23.8M
        CPU: 914ms
     CGroup: /system.slice/usr-merge.service
             ├─668 /usr/bin/bash /usr/lib64/usysconf/usr-merge.sh
             └─670 sleep 530
pjol@solus-mini ~ $ systemd-analyze blame | grep usr-merge
1.204s usr-merge.service

pjol@solus-mini ~ $ find /var/solus/usr-merge/
/var/solus/usr-merge/
/var/solus/usr-merge/merge-complete
/var/solus/usr-merge/eopkg-ready
pjol@solus-mini ~ $ ls -l /bin /lib /lib32 /lib64 /sbin
ls: cannot access '/lib32': No such file or directory
lrwxrwxrwx 1 root root 7  1 okt 18.05 /bin -> usr/bin
lrwxrwxrwx 1 root root 7  1 okt 18.05 /lib -> usr/lib
lrwxrwxrwx 1 root root 9  1 okt 18.05 /lib64 -> usr/lib64
lrwxrwxrwx 1 root root 8  1 okt 18.05 /sbin -> usr/sbin

@Staudey
Copy link
Member

Staudey commented Oct 3, 2024

A report from a MATE VM that hadn't been updated in a while (yes, this time it's actually a VM)

thomas@mate-vm ~ $ systemctl status usr-merge --lines=0
● usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; disabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: active (exited) since Thu 2024-10-03 12:32:33 CEST; 34min ago
    Process: 614 ExecStart=/usr/lib64/usysconf/usr-merge.sh (code=exited, status=0/SUCCESS)
   Main PID: 614 (code=exited, status=0/SUCCESS)
      Tasks: 0 (limit: 4605)
     Memory: 153.5M
        CPU: 1min 17.897s
     CGroup: /system.slice/usr-merge.service
thomas@mate-vm ~ $ systemd-analyze blame | grep usr-merge
1min 16.669s usr-merge.service
thomas@mate-vm ~ $ find /var/solus/usr-merge
/var/solus/usr-merge
/var/solus/usr-merge/merge-complete
/var/solus/usr-merge/eopkg-ready
thomas@mate-vm ~ $ ls -l /bin /lib /lib32 /lib64 /sbin
ls: cannot access '/lib32': No such file or directory
lrwxrwxrwx 1 root root 7 May 11 21:24 /bin -> usr/bin
lrwxrwxrwx 1 root root 7 Oct  3 12:32 /lib -> usr/lib
lrwxrwxrwx 1 root root 9 Oct  3 12:32 /lib64 -> usr/lib64
lrwxrwxrwx 1 root root 8 May 11 21:24 /sbin -> usr/sbin

@silkeh silkeh mentioned this issue Oct 4, 2024
86 tasks
@liontiger23
Copy link
Contributor

Looks like my laptop on stable went through this a week ago. Haven't noticed any problems.

$ systemctl status usr-merge --lines=0
● usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; disabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: active (exited) since Sat 2024-10-19 17:06:35 +07; 4min 29s ago
    Process: 655 ExecStart=/usr/lib64/usysconf/usr-merge.sh (code=exited, status=0/SUCCESS)
   Main PID: 655 (code=exited, status=0/SUCCESS)
        CPU: 3ms
$ systemd-analyze blame | grep usr-merge
   7ms usr-merge.service
$ find /var/solus/usr-merge
/var/solus/usr-merge
/var/solus/usr-merge/merge-complete
/var/solus/usr-merge/eopkg-ready
$ ls -l /bin /lib /lib32 /lib64 /sbin
lrwxrwxrwx 1 root root 7 окт 13 10:15 /bin -> usr/bin
lrwxrwxrwx 1 root root 7 окт 13 10:15 /lib -> usr/lib
lrwxrwxrwx 1 root root 9 окт 13 10:15 /lib32 -> usr/lib32
lrwxrwxrwx 1 root root 9 окт 13 10:15 /lib64 -> usr/lib64
lrwxrwxrwx 1 root root 8 окт 13 10:15 /sbin -> usr/sbin

@liontiger23
Copy link
Contributor

And now my workstation. Seems it was partially updated in May.

$ systemctl status usr-merge --lines=0
● usr-merge.service - Perform the usr-merge
     Loaded: loaded (/usr/lib/systemd/system/usr-merge.service; disabled; preset: enabled)
    Drop-In: /usr/lib64/systemd/system/service.d
             └─10-timeout-abort.conf
     Active: active (exited) since Sat 2024-10-19 17:23:13 +07; 26min ago
    Process: 953 ExecStart=/usr/lib64/usysconf/usr-merge.sh (code=exited, status=0/SUCCESS)
   Main PID: 953 (code=exited, status=0/SUCCESS)
      Tasks: 0 (limit: 154225)
     Memory: 42.6M
        CPU: 785ms
     CGroup: /system.slice/usr-merge.service
$ systemd-analyze blame | grep usr-merge
    1.275s usr-merge.service
$ find /var/solus/usr-merge
/var/solus/usr-merge
/var/solus/usr-merge/eopkg-ready
/var/solus/usr-merge/merge-complete
$ ls -l /bin /lib /lib32 /lib64 /sbin
lrwxrwxrwx 1 root root 7 мая 11 15:13 /bin -> usr/bin
lrwxrwxrwx 1 root root 7 окт 19 17:23 /lib -> usr/lib
lrwxrwxrwx 1 root root 9 окт 19 17:23 /lib32 -> usr/lib32
lrwxrwxrwx 1 root root 9 окт 19 17:23 /lib64 -> usr/lib64
lrwxrwxrwx 1 root root 8 мая 11 15:13 /sbin -> usr/sbin

@silkeh
Copy link
Member Author

silkeh commented Oct 20, 2024

Closing this issue now the usr-merge has been completed and the first merged ISOs have been released.

Thanks for the testing and provided feedback!

@silkeh silkeh closed this as completed Oct 20, 2024
@github-project-automation github-project-automation bot moved this from In Progress to Done in Solus Oct 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Priority: High High priority
Projects
Archived in project
Development

No branches or pull requests