Skip to content

Commit 9b2ee01

Browse files
author
Ian Campbell
committed
fix for shell ~ expansion and set -x
Signed-off-by: Ian Campbell <[email protected]>
1 parent 769d223 commit 9b2ee01

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

.circleci/config.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ image_boot: &image_boot
107107
- run:
108108
name: Test boot
109109
command: |
110+
set -x
110111
ls -lrt /dev/kvm* || true
111112
# Add ssh keys to the image.
112113
# TODO could this be integrated into linuxkit/mkimage-iso-*
@@ -122,6 +123,7 @@ image_boot: &image_boot
122123
#
123124
# Cannot add /bin/ls to Joliet tree. Symlinks can only be added to a Rock Ridge tree.
124125
126+
id_rsa=~/workspace/ssh/id_rsa.pub
125127
xorriso -indev ~/workspace/images/kube-$KUBE_RUNTIME-$KUBE_NETWORK/kube-master.iso \
126128
-outdev kube-master.iso \
127129
-as genisoimage \
@@ -134,7 +136,7 @@ image_boot: &image_boot
134136
-input-charset utf8 \
135137
-- \
136138
-pathspecs on \
137-
-add /root/.ssh/authorized_keys=~/workspace/ssh/id_rsa.pub
139+
-add /root/.ssh/authorized_keys=$id_rsa
138140
139141
#cp ~/workspace/images/kube-$KUBE_RUNTIME-$KUBE_NETWORK/kube-{master,node}.iso .
140142
#cp ~/workspace/images/kube-$KUBE_RUNTIME-$KUBE_NETWORK/kube-master.iso .

0 commit comments

Comments
 (0)