diff --git a/ChangeLog b/ChangeLog index 5a81700..959199b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,13 @@ # ChangeLog for squashmount +*squashmount-15.3.2 + Martin Väth : + - Document /etc/portage/repo.postsync.d/10-squashmount-gentoo better + *squashmount-15.3.1 Martin Väth : - Improve squashdelta postsyncd hook + - Use the earlier name 10-squashmount-gentoo instead of 50-... - More verbose example for mounting of the gentoo repository - Fix typos in manpage diff --git a/bin/squashmount b/bin/squashmount index b2b3146..d2d0fb2 100755 --- a/bin/squashmount +++ b/bin/squashmount @@ -1,7 +1,7 @@ #!/usr/bin/env perl require 5.022; -package Squashmount v15.3.1; +package Squashmount v15.3.2; use strict; use warnings; @@ -1027,9 +1027,9 @@ see the remarks at the end of this manpage.) =item # sync-type (like rsync, webrsync or also git). -=item TAG => 'portage', # Do not use TAG => 'gentoo' here if you use +=item TAG => 'portage', # TAG => 'gentoo' should be reserved for -=item # /etc/portage/repo.postsync.d/50-squashmount-gentoo +=item # /etc/portage/repo.postsync.d/10-squashmount-gentoo =item DIR => '/usr/portage, diff --git a/etc/portage/repo.postsync.d/10-squashmount-gentoo b/etc/portage/repo.postsync.d/10-squashmount-gentoo index f3d2b69..0fc118a 100755 --- a/etc/portage/repo.postsync.d/10-squashmount-gentoo +++ b/etc/portage/repo.postsync.d/10-squashmount-gentoo @@ -9,7 +9,7 @@ repository_name=$1 sync_uri=$2 repository_path=$3 -# Run only if sync_uri contains "/squash" +# Run only if the configured sync-uri contains the string "/squash" case $sync_uri in */squash*) false;; diff --git a/etc/squashmount.pl b/etc/squashmount.pl index dde69f0..45fa451 100644 --- a/etc/squashmount.pl +++ b/etc/squashmount.pl @@ -201,7 +201,9 @@ # We will also have to hook into portage's sync mechanism to remount # after syncing: # The file etc/portage/repo.postsync.d/50-squashmount-gentoo is such a - # hook (which requires that this mount-point be called "gentoo"). + # hook (which requires that this mount-point as well as the repository + # be called "gentoo", and that the sync-uri contains the string + # "/squash"). added_hash($defaults, $non_binary, { TAG => 'gentoo', DIR => '/srv/repo-gentoo',