diff --git a/cmd/migrate.go b/cmd/migrate.go index 4984f56..826654d 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -138,13 +138,6 @@ func MigrateJail(args []string) { } fmt.Printf("Done\n") - // FIXME : config DS sync fails with : - /* cannot receive incremental stream: destination qstore/iocage/jails/kibana has been modified - * since most recent snapshot - */ - // It needs a "zfs rollback destconf@gocage_mig_init" to be able to sync. - // UPDATE 06/06/2022 : Should be fixed using "-Fu" zfs recv flag - fmt.Printf("Synchronize jail config to %s: ", dsconfdest) if err := zfsCopyIncremental(fmt.Sprintf("%s@gocage_mig_init", dsconf), fmt.Sprintf("%s@gocage_mig_last_sync", dsconf), diff --git a/cmd/utils.go b/cmd/utils.go index d5e20ff..c7cd12a 100644 --- a/cmd/utils.go +++ b/cmd/utils.go @@ -285,6 +285,8 @@ func zfsCopyIncremental(firstsnap string, secondsnap string, dest string) error } // then declare receiving process & pipe + /* "-Fu" flags to avoid "cannot receive incremental stream: destination qstore/iocage/jails/kibana has been modified + * since most recent snapshot" error message */ cmd_recv := exec.Command("zfs", "receive", "-Fu", dest) stdin_recv, err := cmd_recv.StdinPipe() if err != nil {