revert lan0, remove vda boot device for libvirt,

remove conditional check for OS using pyenv Signed-off-by: Alex Lau (AvengerMoJo) <alau@suse.com>
aquarist-labs · Apr 22, 2021 · 409c713 · 409c713
1 parent 9ce2766
commit 409c713
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/images/microOS/config.xml b/images/microOS/config.xml
@@ -59,7 +59,7 @@
             bootloader="grub2"
             bootloader_console="gfxterm"
             firmware="uefi"
-            kernelcmdline="quiet systemd.show_status=yes console=ttyS0,115200 console=tty0 net.ifnames=0 \$ignition_firstboot ignition.platform.id=metal root=/dev/vda1 disk=/dev/vda"
+            kernelcmdline="quiet systemd.show_status=yes console=ttyS0,115200 console=tty0 net.ifnames=0 \$ignition_firstboot ignition.platform.id=metal"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"

diff --git a/...oOS/root/etc/sysconfig/network/ifcfg-eth0 → ...oOS/root/etc/sysconfig/network/ifcfg-lan0 b/...oOS/root/etc/sysconfig/network/ifcfg-eth0 → ...oOS/root/etc/sysconfig/network/ifcfg-lan0
diff --git a/tools/setup-dev.sh b/tools/setup-dev.sh
@@ -187,13 +187,11 @@ if ! ${skip_install_deps} ; then
         exit 1
       }
       if [ -n "$pyenv_python" ] ; then
-        if [[ "$osid" == "opensuse-leap" ]] ; then
-          echo "=> try installing dependencies for building python because --pyenv-python requested"
-          sudo zypper --non-interactive install ${dependencies_build_python_leap[*]} || {
-            echo "Dependency installation failed"
-            exit 1
-          }
-        fi
+        echo "=> try installing dependencies for building python because --pyenv-python requested"
+        sudo zypper --non-interactive install ${dependencies_build_python_leap[*]} || {
+          echo "Dependency installation failed"
+          exit 1
+      }
       fi
       ;;
     debian)