diff --git a/.gitea/workflows/action.yml b/.gitea/workflows/action.yml index add3fcf..ecd5ac8 100644 --- a/.gitea/workflows/action.yml +++ b/.gitea/workflows/action.yml @@ -53,20 +53,20 @@ jobs: run: | # For /bin first mv /bin/* /usr/bin/ - rmdir /bin + /bin/rm -d /bin ln -s usr/bin /bin - # For /lib, we need to handle it directory by directory - # First, move all files in the root of /lib + # For /lib, handle it directory by directory mv /lib/[^s]* /usr/lib/ 2>/dev/null || true - # Then handle each subdirectory carefully + # Handle each subdirectory cp -a /lib/systemd/* /usr/lib/systemd/ cp -a /lib/udev/* /usr/lib/udev/ cp -a /lib/x86_64-linux-gnu/* /usr/lib/x86_64-linux-gnu/ - # Remove the now-empty directories - rm -rf /lib/systemd /lib/udev /lib/x86_64-linux-gnu + # Remove directories with full path to rm + /bin/rm -rf /lib/systemd /lib/udev /lib/x86_64-linux-gnu + /bin/rm -d /lib ln -s usr/lib /lib # Now try installing usrmerge