vestasync.py

@@ -200,11 +200,10 @@ def mark_original_restored(c, mark):
 def reboot(c):
     c.run("reboot > /dev/null 2>&1", warn=True)
 
-def git_remove_remote(c):
+def git_add_remote(c):
     hostname = c.run('hostname', hide=True).stdout.strip()
     c.run(f'cd /mnt/data/etc/ && git remote | xargs -L1 git remote remove', warn=True, hide=True)
 
-
 def git_clone(c):
     c.run(f'rm -rf /mnt/data/{args.source_hostname}_etc ', warn=True)
     c.run(f'mkdir -p /mnt/data/{args.source_hostname}_etc ', hide=True)
@@ -230,7 +229,7 @@ def copy_etc(c):
             c.run(f"mkdir -p {dest_item}")
         print(f"Restore: {item} -> {dest_item}")
 
-    print(f"[VestaSync] Copy source .git...")
+    print(f"[VestaSync] Сopy source .git...")
     c.run(f"cp -R /mnt/data/{args.source_hostname}_etc/.git /mnt/data/etc/.git")
 
     print(f"[VestaSync] Remove source etc...")
@@ -305,11 +304,12 @@ def device_install(c):
         print("[VestaSync] Run users cmd's...")
         run_user_cmd(c, args.user_cmd)
 
-    print("[VestaSync] Initializing local repo and add remote...")
+    print("[VestaSync] Initializing local repo...")
     init_repo(c)
 
-    print("[VestaSync] Creating repo on gitea...")
+    print("[VestaSync] Creating repo on gitea and add remote...")
     create_repo(c)
+    git_add_remote(c)
 
     print("[VestaSync] Pushing raw cfg's...")
     ppush_the_repo(c)
@@ -365,6 +365,7 @@ def device_restore():
                 restore_hostname(c)
                 if args.reinstall_packages is not None:
                     install_packages(c)
+                git_add_remote(c)
                 #ppush_the_repo(c) #TODO: не работает!
                 create_autogit_systemd(c)
                 create_automac_systemd(c)