diff options
Diffstat (limited to 'share/hydractl')
| -rwxr-xr-x | share/hydractl/provision-raspi | 2 | ||||
| -rwxr-xr-x | share/hydractl/sync-media | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/share/hydractl/provision-raspi b/share/hydractl/provision-raspi index 8444186..d437ce0 100755 --- a/share/hydractl/provision-raspi +++ b/share/hydractl/provision-raspi @@ -26,7 +26,7 @@ function hydra_provision_config { hydra_user_config device /dev/mmcblk0 "Destination device" hydra_user_config hostname machine "Hostname" hydra_user_config domain example.org "Domain" - hydra_user_config arch armel "System arch" + hydra_user_config arch armhf "System arch" hydra_user_config version stretch "Distro version" hydra_user_config mirror https://deb.debian.org/debian/ "Debian mirror" diff --git a/share/hydractl/sync-media b/share/hydractl/sync-media index 88c8901..742123e 100755 --- a/share/hydractl/sync-media +++ b/share/hydractl/sync-media @@ -219,9 +219,12 @@ for folder in $REPOSITORIES; do # Ensure the repository is identified sync_media_identity + # Disable automatic syncing of content + git config annex.synccontent false + # Sync before changing anything, to make sure the history does not have # conflicts with other remotes - git annex sync + git annex sync --no-content # Fix any playlist permissions sync_media_playlist_perms @@ -233,7 +236,7 @@ for folder in $REPOSITORIES; do sync_media_add # Sync everything again - git annex sync + git annex sync --no-content # Get all that needs to be got sync_media_getall $CACHE/$folder @@ -299,7 +302,11 @@ if [ ! -z "$DRIVE" ] && [ -d "$VOLUME/$MEDIA" ]; then sync_media_ensure_remote $HOST $CACHE/$folder sync_media_identity sync_media_add - git annex sync + + # Disable automatic syncing of content + git config annex.synccontent false + + git annex sync --no-content sync_media_get $VOLUME/$MEDIA/$folder sync_media_getall $VOLUME/$MEDIA/$folder sync_media_fsck @@ -388,7 +395,7 @@ elif [ ! -z "$REMOTE" ] && [ "$REMOTE" != "local" ]; then ( cd $CACHE/$folder git annex copy . --to $REMOTE - git annex sync + git annex sync --no-content ) else echo "Syncing $CACHE/$folder with ssh://$REMOTE.$DOMAIN/$CACHE/$folder..." |