Skip to content

Commit

Permalink
Merge pull request #59 from drauger-os-development/dev
Browse files Browse the repository at this point in the history
do not do stuff for EFI on BIOS
  • Loading branch information
Batcastle authored Jan 16, 2022
2 parents 085ee62 + 3f64dd2 commit ddf9ea1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion DEBIAN/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: system-installer
Version: 2.1.8
Version: 2.1.9
Maintainer: Thomas Castleman <contact@draugeros.org>
Homepage: https://github.com/drauger-os-development/system-installer
Section: admin
Expand Down
2 changes: 1 addition & 1 deletion usr/bin/system-installer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
14 changes: 8 additions & 6 deletions usr/share/system-installer/modules/verify_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit ddf9ea1

Please sign in to comment.