Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-19 22:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

limit grub-install diversion on snappy images to x86 architectures

Browse Source
This commit is contained in:
Oliver Grawert 2015-10-09 12:54:00 +02:00
parent 61c237fd77
commit 0054a24f90
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.348) UNRELEASED; urgency=medium
* limit grub-install diversion on snappy images to x86 architectures
-- Oliver Grawert <ogra@ubuntu.com> Fri, 09 Oct 2015 12:52:57 +0200
livecd-rootfs (2.347) wily; urgency=medium
* divert grub-install on snappy images during rootfs build

16
live-build/ubuntu-core/hooks/01-divert-grub-install.chroot_early
View File

@ -1,13 +1,19 @@
#!/bin/sh -ex
dpkg-divert --quiet --add \
--divert /usr/sbin/grub-install.REAL --rename \
/usr/sbin/grub-install
ARCH=$(dpkg --print-architecture)
cat > /usr/sbin/grub-install <<'EOF'
case $ARCH in
i386|amd64)
dpkg-divert --quiet --add \
--divert /usr/sbin/grub-install.REAL --rename \
/usr/sbin/grub-install
cat > /usr/sbin/grub-install <<'EOF'
#! /bin/sh
echo "grub-install: diverted by livecd-rootfs (will be called later)" >&2
exit 0
EOF
chmod +x /usr/sbin/grub-install
chmod +x /usr/sbin/grub-install
;;
esac

10
live-build/ubuntu-core/hooks/99-undivert-grub-install.chroot
View File

@ -1,4 +1,10 @@
#! /bin/sh -ex
rm -f /usr/sbin/grub-install
dpkg-divert --quiet --remove --rename /usr/sbin/grub-install
ARCH=$(dpkg --print-architecture)
case $ARCH in
i386|amd64)
rm -f /usr/sbin/grub-install
dpkg-divert --quiet --remove --rename /usr/sbin/grub-install
;;
esac