From 93314b5882d5fd5eb19c2bd29eb8a2045f5fd02f Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 10 Feb 2016 08:26:36 -0800 Subject: [PATCH] and the parent directory isn't a mountpoint, so roll back a change that also causes the script to fail. This still warrants refactoring, but let's refactor it in a way that actually works. --- live-build/ubuntu-cpc/hooks/030-root-tarball.binary | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/live-build/ubuntu-cpc/hooks/030-root-tarball.binary b/live-build/ubuntu-cpc/hooks/030-root-tarball.binary index 1b37920d..8fde069f 100755 --- a/live-build/ubuntu-cpc/hooks/030-root-tarball.binary +++ b/live-build/ubuntu-cpc/hooks/030-root-tarball.binary @@ -21,4 +21,7 @@ chroot binary/boot/filesystem.dir mkdir /lib/modules chroot binary/boot/filesystem.dir rm /usr/sbin/grub-probe chroot binary/boot/filesystem.dir dpkg-divert --remove --local --rename /usr/sbin/grub-probe -umount_partition binary/boot/filesystem.dir +mv resolv.conf.tmp "binary/boot/filesystem.dir/etc/resolv.conf" +umount "binary/boot/filesystem.dir/proc" +umount "binary/boot/filesystem.dir/sys" +umount "binary/boot/filesystem.dir/dev"