diff --git a/src/CoreOS/CoreOS-Info.plist b/src/CoreOS/CoreOS-Info.plist
index c0d2354..47b2643 100644
--- a/src/CoreOS/CoreOS-Info.plist
+++ b/src/CoreOS/CoreOS-Info.plist
@@ -17,9 +17,9 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.4.4
+ 1.4.5
CFBundleVersion
- 523
+ 525
LSApplicationCategoryType
public.app-category.utilities
LSMinimumSystemVersion
diff --git a/src/cloud-init/user-data b/src/cloud-init/user-data
index 818e99b..cb103e4 100644
--- a/src/cloud-init/user-data
+++ b/src/cloud-init/user-data
@@ -7,6 +7,7 @@ coreos:
reboot-strategy: off
etcd2:
name: core-01
+ data-dir: /data/var/lib/etcd2
initial-advertise-peer-urls: http://127.0.0.1:2380
initial-cluster-token: core-01_etcd
initial-cluster: core-01=http://127.0.0.1:2380
@@ -33,19 +34,21 @@ coreos:
command: start
content: |
[Unit]
- Description=Formats the persistent drive (if not formated yet)
+ Description=Formats the persistent drive (if not formated)
+ Requires=data.mount
+ Before=data.mount
[Service]
Type=oneshot
RemainAfterExit=yes
- ExecStart=/bin/sh -c '/usr/sbin/blkid -pi /dev/vda | grep TYPE= || /usr/sbin/mkfs.ext4 -i 8192 /dev/vda'
+ ExecStart=/bin/sh -c '/usr/sbin/blkid -pi /dev/vda | grep TYPE= || /usr/sbin/mkfs.ext4 -i 8192 -L core_data /dev/vda'
- name: data.mount
command: start
content: |
[Unit]
Description=Mounts ephemeral to /data
- Requires=format-persistent-disk.service etcd2.service fleet.service docker.service rkt-metadata.socket
+ Requires=format-persistent-disk.service etcd2.service docker.service rkt-metadata.socket
After=format-persistent-disk.service
- Before=etcd2.service fleet.service docker.service rkt-metadata.socket
+ Before=etcd2.service docker.service rkt-metadata.socket
[Mount]
What=/dev/vda
Where=/data
@@ -55,30 +58,18 @@ coreos:
content: |
[Unit]
Description=prepare for etcd,docker,rkt,opt
- Requires=data.mount
+ Requires=data.mount etcd2.service
+ Before=etcd2.service
After=data.mount
[Service]
Type=oneshot
RemainAfterExit=yes
+ ExecStart=/bin/sh -c '[[ -d /data/var/lib/etcd2 ]] || mkdir -p /data/var/lib/etcd2 && /usr/bin/chown etcd:etcd /data/var/lib/etcd2'
+ ExecStart=/bin/sh -c '/usr/bin/chown etcd:etcd /data/var/lib/etcd2'
ExecStart=/bin/sh -c '[[ -d /data/var/lib/docker ]] || mkdir -p /data/var/lib/docker'
ExecStart=/bin/sh -c '[[ -d /data/var/lib/rkt ]] || mkdir -p /data/var/lib/rkt && /usr/bin/chown root:rkt /data/var/lib/rkt && /usr/bin/chmod g+s /data/var/lib/rkt'
- ExecStart=/bin/sh -c '[[ -d /data/var/lib/etcd2 ]] || mkdir -p /data/var/lib/etcd2 && /usr/bin/chown etcd:etcd /data/var/lib/etcd2'
- ExecStart=/bin/sh -c '[[ -d /data/opt/bin ]] || mkdir -p /data/opt/bin'
ExecStart=/bin/sh -c '/usr/bin/chown root:rkt /data/var/lib/rkt && /usr/bin/chmod g+s /data/var/lib/rkt'
- ExecStart=/bin/sh -c '/usr/bin/chown etcd:etcd /data/var/lib/etcd2'
- - name: var-lib-etcd2.mount
- command: start
- content: |
- [Unit]
- Description=Binds /data/var/lib/etcd2 to /var/lib/etcd2
- After=persistent-data-checks.service
- Requires=persistent-data-checks docker.service etcd2.service
- Before=etcd2.service
- [Mount]
- What=/data/var/lib/etcd2
- Where=/var/lib/etcd2
- Type=none
- Options=bind
+ ExecStart=/bin/sh -c '[[ -d /data/opt/bin ]] || mkdir -p /data/opt/bin'
- name: var-lib-docker.mount
command: start
content: |
diff --git a/src/destroy.command b/src/destroy.command
index 9cf4126..47eadbe 100755
--- a/src/destroy.command
+++ b/src/destroy.command
@@ -13,9 +13,6 @@ res_folder=$(cat ~/coreos-osx/.env/resouces_path)
# path to the bin folder where we store our binary files
export PATH=${HOME}/coreos-osx/bin:$PATH
-# get VM IP
-vm_ip=$(/usr/local/sbin/corectl q -i core-01)
-
LOOP=1
while [ $LOOP -gt 0 ]
diff --git a/src/first-init.command b/src/first-init.command
index 0270e13..bc1c87d 100755
--- a/src/first-init.command
+++ b/src/first-init.command
@@ -91,8 +91,11 @@ echo " "
#
cd ~/coreos-osx
-# open bash shell
-/bin/bash
-
+# open user's preferred shell
+if [[ ! -z "$SHELL" ]]; then
+ $SHELL
+else
+ /bin/bash
+fi
diff --git a/src/os_shell.command b/src/os_shell.command
index d735b80..6cc83de 100755
--- a/src/os_shell.command
+++ b/src/os_shell.command
@@ -23,6 +23,12 @@ cd ~/coreos-osx
#
echo " "
echo "Preset CoreOS VM App shell ..."
+echo " "
+
+# open user's preferred shell
+if [[ ! -z "$SHELL" ]]; then
+ $SHELL
+else
+ /bin/bash
+fi
-# open bash shell
-/bin/bash
diff --git a/src/up.command b/src/up.command
index 65121b9..70c00ea 100755
--- a/src/up.command
+++ b/src/up.command
@@ -51,7 +51,7 @@ new_vm=0
# check if data disk exists, if not create it
if [ ! -f $HOME/coreos-osx/data.img ]; then
echo " "
- echo "Data disk does not exist, it will be created now ..."
+ echo "CoreOS VM data disk does not exist, it will be created now ..."
create_data_disk
new_vm=1
fi
@@ -105,5 +105,10 @@ cd ~/coreos-osx
echo " "
echo "Preset CoreOS VM App shell ..."
-# open bash shell
-/bin/bash
+# open user's preferred shell
+if [[ ! -z "$SHELL" ]]; then
+ $SHELL
+else
+ /bin/bash
+fi
+