summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@canonical.com>2011-06-13 10:24:37 +0100
committerDaniel Baumann <daniel@debian.org>2011-06-13 20:33:28 +0200
commitd5510c99100303d73c00dd59907aeda83594d3b5 (patch)
treec3a8110f7b20e9bdb0fdfd046fb897dcaa492b8f
parentabcc4ca9bfc0ca22ce0294616088256062a971fe (diff)
downloadvyos-live-build-d5510c99100303d73c00dd59907aeda83594d3b5.tar.gz
vyos-live-build-d5510c99100303d73c00dd59907aeda83594d3b5.zip
Divert flash-kernel aside while building the chroot (Closes: #630350).
-rwxr-xr-xscripts/build/lb_chroot_dpkg8
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/build/lb_chroot_dpkg b/scripts/build/lb_chroot_dpkg
index 25795a397..3194c0456 100755
--- a/scripts/build/lb_chroot_dpkg
+++ b/scripts/build/lb_chroot_dpkg
@@ -70,6 +70,10 @@ EOF
touch /var/state/samhain/samhain_file
fi
+ # flash-kernel
+ Chroot chroot dpkg-divert --rename --add /usr/sbin/flash-kernel
+ ln -s /bin/true chroot/usr/sbin/flash-kernel
+
# Creating stage file
Create_stagefile .stage/chroot_dpkg
;;
@@ -85,6 +89,10 @@ EOF
# Manual hacks for special packages
+ # flash-kernel
+ rm -f chroot/usr/sbin/flash-kernel
+ Chroot chroot dpkg-divert --rename --remove /usr/sbin/flash-kernel
+
# samhain
if [ -e /var/state/samhain/samhain_file.orig ]
then