mirror of
https://github.com/flatcar/scripts.git
synced 2025-11-27 05:21:34 +01:00
Don't assume this is run from the chroot and point explicity to it.
Add an echo to report the action from that part of the script. Review URL: http://codereview.chromium.org/1699015
This commit is contained in:
parent
ef96430135
commit
9cc8f95a65
@ -6,10 +6,13 @@ set -e
|
|||||||
|
|
||||||
if [ -z $1 ]
|
if [ -z $1 ]
|
||||||
then
|
then
|
||||||
echo "Usage: $0 localaccount_username"
|
echo "Usage: $0 localaccount_username [chroot_path]"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Default chroot_path to its standard location
|
||||||
|
chroot_path=${2:-"../../chroot"}
|
||||||
|
|
||||||
echo "Enabling local account $1@gmail.com."
|
echo "Enabling local account $1@gmail.com."
|
||||||
echo "Remove these files to disable:"
|
echo "Remove these files to disable:"
|
||||||
|
|
||||||
@ -36,10 +39,12 @@ EOF
|
|||||||
done
|
done
|
||||||
|
|
||||||
# Add CHROMEOS_LOCAL_ACCOUNT var to /etc/make.conf.user
|
# Add CHROMEOS_LOCAL_ACCOUNT var to /etc/make.conf.user
|
||||||
|
echo "Setting CHROMEOS_LOCAL_ACCOUNT in $chroot_path/etc/make.conf.user..."
|
||||||
VAR_NAME=CHROMEOS_LOCAL_ACCOUNT
|
VAR_NAME=CHROMEOS_LOCAL_ACCOUNT
|
||||||
if grep -q ${VAR_NAME} /etc/make.conf.user; then
|
if grep -q ${VAR_NAME} $chroot_path/etc/make.conf.user; then
|
||||||
regex="s/${VAR_NAME}=.*/${VAR_NAME}=$1@gmail.com/"
|
regex="s/${VAR_NAME}=.*/${VAR_NAME}=$1@gmail.com/"
|
||||||
sudo sed -i -e "${regex}" /etc/make.conf.user
|
sudo sed -i -e "${regex}" $chroot_path/etc/make.conf.user
|
||||||
else
|
else
|
||||||
sudo sh -c "echo ""${VAR_NAME}=$1@gmail.com"" >> /etc/make.conf.user"
|
sudo sh -c "echo ""${VAR_NAME}=$1@gmail.com"" >> \
|
||||||
|
$chroot_path/etc/make.conf.user"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user