Skip to content

Commit

Permalink
v1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rimusz committed Oct 23, 2015
1 parent 6e56ce1 commit 68e3d86
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
5 changes: 5 additions & 0 deletions src/coreos-osx-install.command
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,10 @@
cp -R "$1"/fleet/ ~/coreos-osx/fleet
#

# copy registry files
cp -f "$1"/registry/config.yml ~/coreos-osx/registry
cp -f "$1"/bin/registry ~/coreos-osx/bin
chmod 755 ~/coreos-osx/bin/registry

# initial init
open -a iTerm.app "$1"/first-init.command
8 changes: 2 additions & 6 deletions src/first-init.command
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,8 @@ echo " "
# create ROOT disk
create_root_disk

# Start docker registry
cd ~/coreos-osx
# stop first just in case it was running
"${res_folder}"/bin/docker_registry stop
# start
"${res_folder}"/bin/docker_registry start
# Stop docker registry first just in case it was running
kill $(ps aux | grep "[r]egistry config.yml" | awk {'print $2'}) >/dev/null 2>&1 &
#

echo " "
Expand Down
5 changes: 3 additions & 2 deletions src/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,9 @@ fi
function save_password {
# save user password to file
echo " "
echo "Your Mac user password will be saved to '~/coreos-osx/.env/password' "
echo "and later one used for 'sudo' commnand to start VM !!!"
echo "Your Mac user's password will be saved to '~/coreos-osx/.env/password' file "
echo "and later one will be used for 'sudo' command to start VM !!!"
echo "This is not the password for the VM access via ssh or console !!!"
echo "Please type your Mac user's password followed by [ENTER]:"
read -s password
echo -n ${password} | base64 > ~/coreos-osx/.env/password
Expand Down
2 changes: 1 addition & 1 deletion src/settings/user-data
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ coreos:
After=network-online.target
[Service]
ExecStartPre=/usr/bin/mkdir -p /opt/bin
ExecStartPre=/usr/bin/wget -P /opt/bin https://github.com/kelseyhightower/setup-network-environment/releases/download/v1.0.0/setup-network-environment
ExecStartPre=/usr/bin/wget -P /opt/bin hhttps://github.com/kelseyhightower/setup-network-environment/releases/download/1.0.1/setup-network-environment
ExecStartPre=/usr/bin/chmod +x /opt/bin/setup-network-environment
ExecStart=/opt/bin/setup-network-environment
RemainAfterExit=yes
Expand Down

0 comments on commit 68e3d86

Please sign in to comment.