From aa20a6de713e22da84e0349104112530a66917de Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 23 Aug 2013 16:25:08 +0200 Subject: [PATCH] Import patches-unapplied version 2.175 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 903725ebddc81ebc975eb3ab4fd7a1f6a6c409a1 New changelog entries: * move media-info file from /var/log/installer to /etc on touch images. --- debian/changelog | 6 ++++++ live-build/auto/build | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 769c4672..e0a3172f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.175) saucy; urgency=low + + * move media-info file from /var/log/installer to /etc on touch images. + + -- Oliver Grawert Fri, 23 Aug 2013 16:25:08 +0200 + livecd-rootfs (2.174) saucy; urgency=low * make sure the bluetooth group has the right android GID on touch builds diff --git a/live-build/auto/build b/live-build/auto/build index 87b172be..bd2d56e8 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -237,9 +237,7 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS fi if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then INFO_DESC="$(lsb_release -d -s)" - - mkdir -p chroot/var/log/installer - echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/var/log/installer/media-info + echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/etc/media-info fi echo "===== Checking size of /usr/share/doc ====="