further fixes

This commit is contained in:
2025-12-16 11:21:18 +01:00
parent 5cbc746528
commit 1d21fc390f
12 changed files with 25 additions and 35 deletions

View File

@@ -29,7 +29,7 @@ Contact the Merlin support team [merlin-admins@lists.psi.ch](mailto:merlin-admin
> ⚠️ In this phase, **it's important that you don't belong to any project**.
> Once the migration is finished, **access to Merlin6 will be no longer possible.**
Please refer to the [Phase 1: Step-by-Step Migration Instructions](/merlin7/migrating.html#phase-1-step-by-step-migration-instructions) section
Please refer to the [Phase 1: Step-by-Step Migration Instructions](#phase-1-step-by-step-migration-instructions) section
for detailed information about user data migration.
### Phase 2: Project Members and Owners — **Start Before August 1**
@@ -42,7 +42,7 @@ For users in active projects:
> ⚠️ In this phase, **data and home directories of group owners and members will be also requested to be migrated in parallel.**
Please refer to the [Phase 2: Migration Instructions](/merlin7/migrating.html#phase-2-migration-instructions) section
Please refer to the [Phase 2: Migration Instructions](#phase-2-migration-instructions) section
for further information.
---
@@ -162,7 +162,7 @@ If a problem occurs during the migration process:
* Files with incorrect permissions
* Ownership mismatches
* Disk quota exceeded on Merlin7
* 📚 Refer to the [⚠️ Common rsync/fpsync Migration Issues](/merlin7/migrating.html#%EF%B8%8F--common-rsyncfpsync-migration-issues) section below for detailed explanations and solutions.
* 📚 Refer to the [⚠️ Common rsync/fpsync Migration Issues](#common-rsyncfpsync-migration-issues) section below for detailed explanations and solutions.
> **Important:** If `migrate_merlin6data.batch` fails, the migration process will automatically cancel `migrate_merlin6home.batch` to avoid ending in an inconsistent state.
@@ -266,7 +266,7 @@ CLUSTER: merlin6
## Phase 2: Migration Instructions
Please refer to the [Prerequisites and Preparation](/merlin7/migrating.html#-prerequisites-and-preparation) section for initial setup steps.
Please refer to the [Prerequisites and Preparation](#prerequisites-and-preparation) section for initial setup steps.
Further instructions will be sent via email once the owning team is contacted by the Merlin administrators.
---