Merge branch 'master' of github.com:opencomputeproject/OpenNetworkLinux

Conflicts:
	packages/base/all/vendor-config-onl/src/etc/onl/sysconfig/00-defaults.yml
	packages/base/all/vendor-config-onl/src/python/onl/install/BaseInstall.py

builds/amd64/installer/installed/builds/boot-config

@@ -1,4 +1,3 @@
 NETDEV=ma1
-NETAUTO=dhcp
 BOOTMODE=INSTALLED
 SWI=images::latest

builds/amd64/installer/swi/builds/boot-config

@@ -1,4 +1,3 @@
 NETDEV=ma1
-NETAUTO=dhcp
 BOOTMODE=SWI
 SWI=images::latest

builds/arm64/installer/installed/builds/boot-config

@@ -1,4 +1,3 @@
 NETDEV=ma1
-NETAUTO=dhcp
 BOOTMODE=INSTALLED
 SWI=images::latest

builds/arm64/installer/swi/builds/boot-config

@@ -1,4 +1,3 @@
 NETDEV=ma1
-NETAUTO=dhcp
 BOOTMODE=SWI
 SWI=images::latest

builds/armel/installer/installed/builds/boot-config

@@ -1,4 +1,3 @@
 NETDEV=ma1
-NETAUTO=dhcp
 BOOTMODE=INSTALLED
 SWI=images::latest

builds/armel/installer/swi/builds/boot-config

@@ -1,4 +1,3 @@
 NETDEV=ma1
-NETAUTO=dhcp
 BOOTMODE=SWI
 SWI=images::latest

builds/powerpc/installer/installed/builds/boot-config

@@ -1,4 +1,3 @@
 NETDEV=ma1
-NETAUTO=dhcp
 BOOTMODE=INSTALLED
 SWI=images::latest

builds/powerpc/installer/swi/builds/boot-config

@@ -1,4 +1,3 @@
 NETDEV=ma1
-NETAUTO=dhcp
 BOOTMODE=SWI
 SWI=images::latest

packages/base/all/vendor-config-onl/src/python/onl/install/BaseInstall.py

@@ -692,7 +692,7 @@ class UbootInstaller(SubprocessMixin, Base):
         except PartedException as ex:
             self.log.error("cannot get partition table from %s: %s",
                            self.device, str(ex))
-        except Error as ex:
+        except Exception:
             self.log.exception("cannot get partition table from %s"
                                self.device)
 
@@ -733,7 +733,6 @@ class UbootInstaller(SubprocessMixin, Base):
                 break
 
         if not loaderBasename:
-            raise ValueError("platform loader file missing!")
             self.log.error("The platform loader file is missing.")
             return 1