mirror of
https://github.com/rancher/os.git
synced 2025-09-25 12:47:20 +00:00
Remove VMWARE APPEND because we do not need it
This commit is contained in:
@@ -40,7 +40,7 @@ RUN echo "Acquire::http { Proxy \"$APTPROXY\"; };" >> /etc/apt/apt.conf.d/01prox
|
||||
|
||||
########## Dapper Configuration #####################
|
||||
|
||||
ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG APTPROXY ENGINE_REGISTRY_MIRROR KERNEL_CHECK APPEND_SYSTEM_IMAGES VMWARE_APPEND
|
||||
ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG APTPROXY ENGINE_REGISTRY_MIRROR KERNEL_CHECK APPEND_SYSTEM_IMAGES
|
||||
ENV DAPPER_DOCKER_SOCKET true
|
||||
ENV DAPPER_SOURCE /go/src/github.com/rancher/os
|
||||
ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd ./build/kernel
|
||||
|
1
Makefile
1
Makefile
@@ -49,7 +49,6 @@ rpi64: .dapper
|
||||
vmware: .dapper
|
||||
mkdir -p dist
|
||||
APPEND_SYSTEM_IMAGES="rancher/os-openvmtools:10.2.5-3" \
|
||||
VMWARE_APPEND="console=tty1 console=ttyS0,115200n8 printk.devkmsg=on rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.autologin=ttyS1 panic=10" \
|
||||
./.dapper release-vmware 2>&1 | tee dist/release.log
|
||||
|
||||
hyperv: .dapper
|
||||
|
@@ -19,11 +19,6 @@ if [ "$VMWARE_AUTOFORMAT" = 1 ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ "$VMWARE_APPEND" != "" ]; then
|
||||
echo "--append ${VMWARE_APPEND}"
|
||||
APPEND_PARAM="--append \"${VMWARE_APPEND}\""
|
||||
fi
|
||||
|
||||
mkdir -p /tmp/dist/openstack/latest ./dist/vmware
|
||||
|
||||
cat > /tmp/dist/openstack/latest/user_data << EOF
|
||||
@@ -39,7 +34,6 @@ sleep 5
|
||||
openvt -s -- tail -f log &
|
||||
ros install \
|
||||
-d /dev/vda \
|
||||
${APPEND_PARAM} \
|
||||
-f \
|
||||
--no-reboot >log 2>&1
|
||||
|
||||
|
Reference in New Issue
Block a user