mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 22:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

scripts: repair build_image nostatefuldev collision

Browse Source 
Change-Id: Ib9fcc078d8e0223cd1b1376db91d8e71ae8359a6

BUG=cp file to itself fails in case of nostatefuldev
TEST=ran build_image with and without statefuldev

Review URL: http://codereview.chromium.org/4959001
Patch from Trevor Bourget <tbourget@codeaurora.org>.
This commit is contained in:
Trevor Bourget 2010-12-13 09:44:32 -07:00 committed by Brian Daugherty
parent 230756fc83
commit 8e6abb04c6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_image
View File

@ -415,7 +415,8 @@ update_dev_packages() {
fi fi
# Install the bare necessary files so that the "emerge" command works # Install the bare necessary files so that the "emerge" command works
sudo cp ${root_dev_dir}/etc/make.globals ${ROOT_FS_DIR}/etc/ [ ${FLAGS_statefuldev} -eq ${FLAGS_TRUE} ] && \
sudo cp ${root_dev_dir}/etc/make.globals ${ROOT_FS_DIR}/etc/
sudo sed -i s,/usr/bin/wget,wget, ${ROOT_FS_DIR}/etc/make.globals sudo sed -i s,/usr/bin/wget,wget, ${ROOT_FS_DIR}/etc/make.globals
sudo mkdir -p ${ROOT_FS_DIR}/etc/make.profile sudo mkdir -p ${ROOT_FS_DIR}/etc/make.profile