[SCM] live-boot branch, tmp-persistent-custom, updated. debian/3.0_a25-1-60-gbd73dfc

Tails developers amnesia at boum.org
Tue Mar 27 09:02:22 UTC 2012


The following commit has been merged in the tmp-persistent-custom branch:
commit e2aa261aee6b0553fdfaadb045660b120dd480cf
Author: Tails developers <amnesia at boum.org>
Date:   Mon Mar 26 15:48:15 2012 +0200

    Fix ownership for links created for linkfiles custom mounts.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 860e6ff..5306cf5 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1187,12 +1187,14 @@ link_files ()
 			fi
 			link_files "${src}" "${dest}" "${src_mask}"
 		else
+			local final_src=${src}
 			if [ -n "${src_mask}" ]
 			then
-				src="$(echo ${src} | sed "s|^${src_mask}||")"
+				final_src="$(echo ${final_src} | sed "s|^${src_mask}||")"
 			fi
 			rm -rf "${dest}" 2> /dev/null
-			ln -s "${src}" "${dest}"
+			ln -s "${final_src}" "${dest}"
+			chown_ref "${src}" "${dest}"
 		fi
 	done
 }

-- 
live-boot



More information about the debian-live-changes mailing list