From 728dfdae013d54bc0d4de80231ebca7312fb887b Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sun, 24 Feb 2013 14:52:21 -0800 Subject: [PATCH] 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 --- sdk_lib/make_chroot.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh index 156bb7f7d3..5f64193619 100755 --- a/sdk_lib/make_chroot.sh +++ b/sdk_lib/make_chroot.sh @@ -471,14 +471,11 @@ early_enter_chroot "${CHROOT_TRUNK_DIR}/chromite/bin/cros_setup_toolchains" \ info "Deselecting 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. info "Unmerge openrc" 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 ..." early_enter_chroot $EMERGE_CMD -uNv $USEPKG --select $EMERGE_JOBS \