Other fixes

microshift.Containerfile

@@ -35,16 +35,16 @@ COPY overlay.d/10-fcos/ /
 COPY overlay.d/15-microshift /
 COPY --from=artifacts /srv/fakerpms/ /tmp/rpms/
 
-RUN set -x; PACKAGES_INSTALL="NetworkManager-ovs cri-o cri-tools openvswitch3.1"; \
-    rpm-ostree install $PACKAGES_INSTALL \
-    && rpm-ostree install microshift \
-    # Symlink ovs-vswitchd to dpdk version of OVS
-    && ln -s /usr/sbin/ovs-vswitchd.dpdk /usr/sbin/ovs-vswitchd \
-    # Symlink nc to netcat due to known issue in rpm-ostree - https://github.com/coreos/rpm-ostree/issues/1614
-    && ln -s /usr/bin/netcat /usr/bin/nc \
-    && rm -rf /go /var/lib/unbound /tmp/rpms \
-    && rm -rf /tmp/rpms \
-    && ostree container commit
+# RUN set -x; PACKAGES_INSTALL="NetworkManager-ovs cri-o cri-tools openvswitch3.1"; \
+#     rpm-ostree install $PACKAGES_INSTALL \
+#     && rpm-ostree install microshift \
+#     # Symlink ovs-vswitchd to dpdk version of OVS
+#     && ln -s /usr/sbin/ovs-vswitchd.dpdk /usr/sbin/ovs-vswitchd \
+#     # Symlink nc to netcat due to known issue in rpm-ostree - https://github.com/coreos/rpm-ostree/issues/1614
+#     && ln -s /usr/bin/netcat /usr/bin/nc \
+#     && rm -rf /go /var/lib/unbound /tmp/rpms \
+#     && rm -rf /tmp/rpms \
+#     && ostree container commit
 
 RUN set -x; sed -i \
       's/#AutomaticUpdatePolicy=.*/AutomaticUpdatePolicy=stage/' \