mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-22 14:11:07 +02:00
fix(sdk_lib/make_chroot.sh): use efunctions functions.sh
use the efunctions package for the /etc/init.d/functions.sh script instead of backing up the old function.sh which doesn't work with the new baselayout
This commit is contained in:
parent
6df1838526
commit
728dfdae01
@ -471,14 +471,11 @@ early_enter_chroot "${CHROOT_TRUNK_DIR}/chromite/bin/cros_setup_toolchains" \
|
|||||||
info "Deselecting dhcpcd"
|
info "Deselecting dhcpcd"
|
||||||
early_enter_chroot $EMERGE_CMD --deselect dhcpcd
|
early_enter_chroot $EMERGE_CMD --deselect dhcpcd
|
||||||
|
|
||||||
# TODO: Hack! Link in functions.sh
|
|
||||||
early_enter_chroot cp /etc/init.d/functions.sh /tmp
|
|
||||||
|
|
||||||
# openrc is included in stage3. We don't need it.
|
# openrc is included in stage3. We don't need it.
|
||||||
info "Unmerge openrc"
|
info "Unmerge openrc"
|
||||||
early_enter_chroot $EMERGE_CMD --unmerge sys-apps/openrc sys-apps/sysvinit sys-fs/udev-init-scripts
|
early_enter_chroot $EMERGE_CMD --unmerge sys-apps/openrc sys-apps/sysvinit sys-fs/udev-init-scripts
|
||||||
|
|
||||||
early_enter_chroot cp /tmp/functions.sh /etc/init.d/functions.sh
|
early_enter_chroot INSTALL_MASK="" $EMERGE_CMD coreos-base/efunctions
|
||||||
|
|
||||||
info "Running emerge curl sudo ..."
|
info "Running emerge curl sudo ..."
|
||||||
early_enter_chroot $EMERGE_CMD -uNv $USEPKG --select $EMERGE_JOBS \
|
early_enter_chroot $EMERGE_CMD -uNv $USEPKG --select $EMERGE_JOBS \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user