mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-15 08:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #107 from marineam/diediedie

Browse Source 
fix(sys-kernel/bootengine): All commands in postinst should be fatal.
This commit is contained in:
Greg Kroah-Hartman 2013-07-22 09:50:51 -07:00
commit 14ae803a88
3 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r10.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r11.ebuild vendored
View File

23
sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1.ebuild vendored
View File

@ -30,25 +30,26 @@ src_install() {
# cpio image in pkg_postinst() where we are free to mount filesystems, chroot, # cpio image in pkg_postinst() where we are free to mount filesystems, chroot,
# and other fun stuff. # and other fun stuff.
pkg_postinst() { pkg_postinst() {
mount -t proc proc ${ROOT}/proc mount -t proc proc ${ROOT}/proc || die
mount --rbind /dev ${ROOT}/dev mount --rbind /dev ${ROOT}/dev || die
mount --rbind /sys ${ROOT}/sys mount --rbind /sys ${ROOT}/sys || die
mount --rbind /run ${ROOT}/run mount --rbind /run ${ROOT}/run || die
# The keyboard tables are all still being included, which we need to # The keyboard tables are all still being included, which we need to
# figure out how to remove someday. # figure out how to remove someday.
chroot ${ROOT} dracut --force --no-kernel --nofscks --fstab --no-compress /tmp/bootengine.cpio chroot ${ROOT} dracut --force --no-kernel --nofscks \
--fstab --no-compress /tmp/bootengine.cpio || die
umount --recursive ${ROOT}/proc umount --recursive ${ROOT}/proc || die
umount --recursive ${ROOT}/dev umount --recursive ${ROOT}/dev || die
umount --recursive ${ROOT}/sys umount --recursive ${ROOT}/sys || die
umount --recursive ${ROOT}/run umount --recursive ${ROOT}/run || die
# as we are not in src_install() insinto and doins do not work here, so # as we are not in src_install() insinto and doins do not work here, so
# manually copy the file around # manually copy the file around
cpio=${ROOT}/tmp/bootengine.cpio cpio=${ROOT}/tmp/bootengine.cpio
chmod 644 ${cpio} || die chmod 644 ${cpio} || die
mkdir -p ${ROOT}/usr/share/bootengine/ mkdir -p ${ROOT}/usr/share/bootengine/ || die
cp ${cpio} ${ROOT}/usr/share/bootengine/ || die cp ${cpio} ${ROOT}/usr/share/bootengine/ || die
rm ${cpio} rm ${cpio} || die
} }

30
sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild vendored
View File

@ -14,7 +14,7 @@ SRC_URI=""
LICENSE="BSD" LICENSE="BSD"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~arm ~x86" KEYWORDS="~amd64 ~x86"
DEPEND=" DEPEND="
sys-apps/kexec-tools sys-apps/kexec-tools
@ -29,26 +29,26 @@ src_install() {
# cpio image in pkg_postinst() where we are free to mount filesystems, chroot, # cpio image in pkg_postinst() where we are free to mount filesystems, chroot,
# and other fun stuff. # and other fun stuff.
pkg_postinst() { pkg_postinst() {
mount -t proc proc ${ROOT}/proc mount -t proc proc ${ROOT}/proc || die
mount --rbind /dev ${ROOT}/dev mount --rbind /dev ${ROOT}/dev || die
mount --rbind /sys ${ROOT}/sys mount --rbind /sys ${ROOT}/sys || die
mount --rbind /run ${ROOT}/run mount --rbind /run ${ROOT}/run || die
# --host-only "should" mean that we only include the stuff that this build # The keyboard tables are all still being included, which we need to
# root needs. The keyboard tables are all still being included, which we # figure out how to remove someday.
# need to figure out how to remove someday. chroot ${ROOT} dracut --force --no-kernel --nofscks \
chroot ${ROOT} dracut --force --no-kernel --nofscks --fstab --no-compress /tmp/bootengine.cpio --fstab --no-compress /tmp/bootengine.cpio || die
umount --recursive ${ROOT}/proc umount --recursive ${ROOT}/proc || die
umount --recursive ${ROOT}/dev umount --recursive ${ROOT}/dev || die
umount --recursive ${ROOT}/sys umount --recursive ${ROOT}/sys || die
umount --recursive ${ROOT}/run umount --recursive ${ROOT}/run || die
# as we are not in src_install() insinto and doins do not work here, so # as we are not in src_install() insinto and doins do not work here, so
# manually copy the file around # manually copy the file around
cpio=${ROOT}/tmp/bootengine.cpio cpio=${ROOT}/tmp/bootengine.cpio
chmod 644 ${cpio} || die chmod 644 ${cpio} || die
mkdir -p ${ROOT}/usr/share/bootengine/ mkdir -p ${ROOT}/usr/share/bootengine/ || die
cp ${cpio} ${ROOT}/usr/share/bootengine/ || die cp ${cpio} ${ROOT}/usr/share/bootengine/ || die
rm ${cpio} rm ${cpio} || die
} }