Merge lp:~sil2100/livecd-rootfs/fix-apt-lists-rm-hook into lp:livecd-rootfs

Proposed by Łukasz Zemczak on 2015-10-01
Status: Merged
Approved by: Oliver Grawert on 2015-11-11
Approved revision: 1208
Merged at revision: 1238
Proposed branch: lp:~sil2100/livecd-rootfs/fix-apt-lists-rm-hook
Merge into: lp:livecd-rootfs
Diff against target: 12 lines (+2/-2)
1 file modified
live-build/ubuntu-touch/hooks/99-remove-lists.binary (+2/-2)
To merge this branch: bzr merge lp:~sil2100/livecd-rootfs/fix-apt-lists-rm-hook
Reviewer Review Type Date Requested Status
Oliver Grawert 2015-10-01 Approve on 2015-11-11
Review via email: mp+273117@code.launchpad.net

Commit Message

Fix the previous apt list removal hook. This hook needs to be .binary as otherwise we're still left with apt lists when the image is published.

Description of the Change

Fix the previous apt list removal hook. This hook needs to be .binary as otherwise we're still left with apt lists when the image is published.

To post a comment you must log in.
Oliver Grawert (ogra) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'live-build/ubuntu-touch/hooks/99-remove-lists.chroot' => 'live-build/ubuntu-touch/hooks/99-remove-lists.binary'
2--- live-build/ubuntu-touch/hooks/99-remove-lists.chroot 2015-09-22 08:20:26 +0000
3+++ live-build/ubuntu-touch/hooks/99-remove-lists.binary 2015-10-01 18:07:33 +0000
4@@ -5,5 +5,5 @@
5 # Author: Łukasz 'sil2100' Zemczak <achiang@canonical.com>
6 # Date : September 22, 2015
7
8-echo "Removing /var/lib/apt/lists/*"
9-find /var/lib/apt/lists/ -type f | xargs rm -f
10+echo "Removing /var/lib/apt/lists/* from the binary"
11+find binary/boot/filesystem.dir/var/lib/apt/lists/ -type f | xargs rm -f
12\ No newline at end of file

Subscribers

People subscribed via source and target branches