[vcreate.sh] Fix accidental diff commit
This commit is contained in:
parent
ac47415fd8
commit
a330e46647
@ -16,10 +16,7 @@ set IMAGE=ubuntu20.img
|
|||||||
set PUBKEY=/home/simon/.ssh/id_ed25519.pub
|
set PUBKEY=/home/simon/.ssh/id_ed25519.pub
|
||||||
set NAMESERVER=192.168.10.254
|
set NAMESERVER=192.168.10.254
|
||||||
set GATEWAY=192.168.10.254
|
set GATEWAY=192.168.10.254
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
set PREFIX=24
|
set PREFIX=24
|
||||||
>>>>>>> 93e0bfb4f86673a87465d127972c447d7c48cfc0
|
|
||||||
|
|
||||||
# create vm
|
# create vm
|
||||||
$VM create \
|
$VM create \
|
||||||
@ -27,9 +24,5 @@ $VM create \
|
|||||||
-s $SIZE \
|
-s $SIZE \
|
||||||
-i $IMAGE \
|
-i $IMAGE \
|
||||||
-C -k $PUBKEY \
|
-C -k $PUBKEY \
|
||||||
<<<<<<< HEAD
|
|
||||||
-n "ip=$IP/24;gateway=$GATEWAY;nameservers=$NAMESERVER" \
|
|
||||||
=======
|
|
||||||
-n "ip=$IP/$PREFIX;gateway=$GATEWAY;nameservers=$NAMESERVER" \
|
-n "ip=$IP/$PREFIX;gateway=$GATEWAY;nameservers=$NAMESERVER" \
|
||||||
>>>>>>> 93e0bfb4f86673a87465d127972c447d7c48cfc0
|
|
||||||
$HOSTNAME
|
$HOSTNAME
|
||||||
|
Loading…
Reference in New Issue
Block a user