diff --git a/DEBIAN/control b/DEBIAN/control index 69d7c2a4..c121b195 100644 --- a/DEBIAN/control +++ b/DEBIAN/control @@ -1,5 +1,5 @@ Package: system-installer -Version: 2.1.8 +Version: 2.1.9 Maintainer: Thomas Castleman Homepage: https://github.com/drauger-os-development/system-installer Section: admin diff --git a/usr/bin/system-installer.cxx b/usr/bin/system-installer.cxx index a0a84e50..c6eba33f 100644 --- a/usr/bin/system-installer.cxx +++ b/usr/bin/system-installer.cxx @@ -46,7 +46,7 @@ using namespace std; -str VERSION = "2.1.8"; +str VERSION = "2.1.9"; str R = "\033[0;31m"; str G = "\033[0;32m"; str Y = "\033[1;33m"; diff --git a/usr/share/system-installer/modules/verify_install.py b/usr/share/system-installer/modules/verify_install.py index 04dc2da7..71c0341c 100755 --- a/usr/share/system-installer/modules/verify_install.py +++ b/usr/share/system-installer/modules/verify_install.py @@ -114,17 +114,19 @@ def verify(username, root, distro): remove("/home/" + username + "/Desktop/system-installer.desktop") except FileNotFoundError: pass - status = is_default_entry(distro) - if status in (False, None): - if status is None: - add_boot_entry(root, distro) - set_default_entry(disto) + if path.isdir("/sys/firmware/efi"): + # on UEFI, set as default entry + status = is_default_entry(distro) + if status in (False, None): + if status is None: + add_boot_entry(root, distro) + set_default_entry(disto) cache = apt.cache.Cache() cache.open() if username != "drauger-user": if (("system-installer" in cache) and cache["system-installer"].is_installed): cache["system-installer"].mark_delete() - if path.isfile("/etc/kernel/postinst.d/zz-update-systemd-boot"): + if path.isdir("/sys/firmware/efi"): with cache.actiongroup(): for each in cache: if (("grub" in each.name) and each.is_installed):