diff --git a/debian/changelog b/debian/changelog index 27120eb..4173aaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ubuntu-dev-tools (0.157) unstable; urgency=medium + + * mk-sbuild: cp localtime and timezone a little harder (LP: #1569400) + + -- Adam Conrad Sun, 08 May 2016 23:58:48 -0600 + ubuntu-dev-tools (0.156) unstable; urgency=medium [ Adam Conrad ] diff --git a/mk-sbuild b/mk-sbuild index 80f11ee..e432211 100755 --- a/mk-sbuild +++ b/mk-sbuild @@ -713,7 +713,7 @@ cat "$TEMP_SOURCES" | sed -e "s|RELEASE|$RELEASE|g" | \ rm -f "$TEMP_SOURCES" # Copy the timezone (comment this out if you want to leave the chroot at UTC) -sudo cp /etc/localtime /etc/timezone "$MNT"/etc/ +sudo cp -P --remove-destination /etc/localtime /etc/timezone "$MNT"/etc/ # Create a schroot entry for this chroot TEMP_SCHROOTCONF=`mktemp -t schrootconf-XXXXXX` TEMPLATE_SCHROOTCONF=~/.mk-sbuild.schroot.conf