efibootdude 0.5__tar.gz → 0.5.2__tar.gz

efibootdude-0.5.2/.gitignore

@@ -0,0 +1,6 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+.vscode/
+*.egg-info/
+*.tar.gz
+*.whl

{efibootdude-0.5/src/efibootdude.egg-info → efibootdude-0.5.2}/PKG-INFO

@@ -1,20 +1,18 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: efibootdude
-Version: 0.5
+Version: 0.5.2
 Summary: A visual wrapper for efibootmgr
-Author-email: Joe Defen <joedef@duck.com>
-License: MIT
-Project-URL: Homepage, https://github.com/joedefen/efibootdude
-Project-URL: Bug Tracker, https://github.com/joedefen/efibootdude/issues
 Keywords: app,installer,manager,appimages
+Author-email: Joe Defen <joedef@duck.com>
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX :: Linux
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: importlib-metadata; python_version < "3.8"
-Requires-Dist: psutil>=5.9
+Requires-Dist: importlib-metadata; python_version<"3.8"
+Project-URL: Bug Tracker, https://github.com/joedefen/efibootdude/issues
+Project-URL: Homepage, https://github.com/joedefen/efibootdude
 
 # EfiBootDude
 `efibootdude` presents a visual (curses) interface to `efibootmgr` which allows editing the bios
@@ -56,9 +54,12 @@ At this point
   active by typing `*` for the corresponding entries.
 * Press `ESC` key to abandon any changes and reload the boot information.
 * When ready to write the changes to the BIOS, enter `w`.
-* When the changes look good, type `b` to reboot, if you wish.
 * When writing the changes, `efibootdude` drops out of menu mode so you can
   verify the underlying commands, error codes, and error messages.
+* After you write changes, type `b` to reboot, if you wish and the boot menu looks OK.
+* BTW, the top-line keys vary per context; e.g.:
+  * `w` is only shown with pending changes, and
+  * `b` is only shown w/o pending changes.
 
 ## Caveats
 * Some operations may not work permanently even though there is no indication from `efibootmgr`
@@ -71,3 +72,4 @@ This project was inspired by [Elinvention/efiboots](https://github.com/Elinventi
 * to be easier to install especially when not in your distro's repos.
 * to clearly present the partition of the boot entries (as a mount point if mounted and, otherwise, the device pathname).
 * to show the underlying commands being run for education, for verification, and for help on investigating issues.
+

{efibootdude-0.5 → efibootdude-0.5.2}/README.md

@@ -38,9 +38,12 @@ At this point
   active by typing `*` for the corresponding entries.
 * Press `ESC` key to abandon any changes and reload the boot information.
 * When ready to write the changes to the BIOS, enter `w`.
-* When the changes look good, type `b` to reboot, if you wish.
 * When writing the changes, `efibootdude` drops out of menu mode so you can
   verify the underlying commands, error codes, and error messages.
+* After you write changes, type `b` to reboot, if you wish and the boot menu looks OK.
+* BTW, the top-line keys vary per context; e.g.:
+  * `w` is only shown with pending changes, and
+  * `b` is only shown w/o pending changes.
 
 ## Caveats
 * Some operations may not work permanently even though there is no indication from `efibootmgr`

efibootdude-0.5.2/deploy

@@ -0,0 +1,8 @@
+#!/bin/bash
+script_dir=$(dirname "$0")
+set -ex
+cd ${script_dir}
+rm -rf ./dist
+python3 -m pip install build --break-system-packages
+python3 -m build
+pip install -e . --break-system-packages

{efibootdude-0.5/src → efibootdude-0.5.2}/efibootdude/main.py

@@ -358,7 +358,8 @@ class EfiBootDude:
                 actions['m'] = 'modify'
             if self.mods.dirty:
                 actions['w'] = 'write'
-            actions['b'] = 'boot'
+            else:
+                actions['b'] = 'boot'
 
         return actions
 
@@ -500,6 +501,10 @@ class EfiBootDude:
             return None
 
         if key == ord('b'):
+            if self.mods.dirty:
+                self.win.alert('Pending changes (on return, use "w" to commit or "ESC" to discard)')
+                return
+            
             answer = self.win.answer(prompt='Type "reboot" to reboot',
                     seed='reboot', width=80)
             if answer.strip().lower().startswith('reboot'):

efibootdude-0.5.2/pyproject.toml

@@ -0,0 +1,30 @@
+[build-system]
+requires = ["flit_core>=3.4"]
+build-backend = "flit_core.buildapi"
+
+[project]
+name = "efibootdude"
+version = "0.5.2"
+description = "A visual wrapper for efibootmgr"
+authors = [
+    { name = "Joe Defen", email = "joedef@duck.com" }
+]
+readme = "README.md"
+license = { text = "MIT" }
+requires-python = ">=3.8"
+keywords = ["app", "installer", "manager", "appimages"]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: POSIX :: Linux"
+]
+dependencies = [
+    'importlib-metadata; python_version<"3.8"',
+]
+
+[project.urls]
+"Homepage" = "https://github.com/joedefen/efibootdude"
+"Bug Tracker" = "https://github.com/joedefen/efibootdude/issues"
+
+[project.scripts]
+efibootdude = "efibootdude.main:main"

efibootdude-0.5.2/tests/efibootmgr.peggy.txt

@@ -0,0 +1,13 @@
+BootCurrent: 000A
+Timeout: 0 seconds
+BootOrder: 000A,0009,0007,0006,0005,0003,0000,0008
+Boot0000* UEFI KBG40ZNS256G NVMe KIOXIA 256GB X0LPG5C2QUM1 1	PciRoot(0x0)/Pci(0x1d,0x0)/Pci(0x0,0x0)/NVMe(0x1,8C-E3-8E-04-01-4B-A2-BE)/HD(1,GPT,ff29365d-a734-4a11-a40d-24ee292cf494,0x800,0x4b000)/File(\EFI\Boot\BootX64.efi){auto_created_boot_option}
+Boot0001* ONBOARD NIC (IPV4)	PciRoot(0x0)/Pci(0x1d,0x5)/Pci(0x0,0x0)/MAC(b07b255eaf61,0)/IPv4(0.0.0.00.0.0.0,0,0){auto_created_boot_option}
+Boot0002* ONBOARD NIC (IPV6)	PciRoot(0x0)/Pci(0x1d,0x5)/Pci(0x0,0x0)/MAC(b07b255eaf61,0)/IPv6([::]:<->[::]:,0,0){auto_created_boot_option}
+Boot0003* Windows Boot Manager	HD(1,GPT,ff29365d-a734-4a11-a40d-24ee292cf494,0x800,0x4b000)/File(\EFI\Microsoft\Boot\bootmgfw.efi)57494e444f5753000100000088000000780000004200430044004f0042004a004500430054003d007b00390064006500610038003600320063002d0035006300640064002d0034006500370030002d0061006300630031002d006600330032006200330034003400640034003700390035007d000000ffff0100000010000000040000007fff0400
+Boot0005* Fedora	HD(9,GPT,5dd8ef9c-ef8a-e24c-a3a3-d5ec461cf143,0x1af69000,0x400000)/File(\EFI\fedora\shimx64.efi)
+Boot0006* neon	HD(1,GPT,ff29365d-a734-4a11-a40d-24ee292cf494,0x800,0x4b000)/File(\EFI\neon\shimx64.efi)
+Boot0007* Fedora	HD(9,GPT,5dd8ef9c-ef8a-e24c-a3a3-d5ec461cf143,0x1af69000,0x400000)/File(\EFI\fedora\shimx64.efi)
+Boot0008* UEFI KBG40ZNS256G NVMe KIOXIA 256GB X0LPG5C2QUM1 1 2	PciRoot(0x0)/Pci(0x1d,0x0)/Pci(0x0,0x0)/NVMe(0x1,8C-E3-8E-04-01-4B-A2-BE)/HD(9,GPT,5dd8ef9c-ef8a-e24c-a3a3-d5ec461cf143,0x1af69000,0x400000)/File(\EFI\Boot\BootX64.efi){auto_created_boot_option}
+Boot0009* Linux Boot Manager	HD(9,GPT,5dd8ef9c-ef8a-e24c-a3a3-d5ec461cf143,0x1af69000,0x400000)/File(\EFI\systemd\systemd-bootx64.efi)
+Boot000A* Ubuntu	HD(9,GPT,5dd8ef9c-ef8a-e24c-a3a3-d5ec461cf143,0x1af69000,0x400000)/File(\EFI\ubuntu\shimx64.efi)

efibootdude-0.5/PKG-INFO

@@ -1,73 +0,0 @@
-Metadata-Version: 2.1
-Name: efibootdude
-Version: 0.5
-Summary: A visual wrapper for efibootmgr
-Author-email: Joe Defen <joedef@duck.com>
-License: MIT
-Project-URL: Homepage, https://github.com/joedefen/efibootdude
-Project-URL: Bug Tracker, https://github.com/joedefen/efibootdude/issues
-Keywords: app,installer,manager,appimages
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: POSIX :: Linux
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: importlib-metadata; python_version < "3.8"
-Requires-Dist: psutil>=5.9
-
-# EfiBootDude
-`efibootdude` presents a visual (curses) interface to `efibootmgr` which allows editing the bios
-boot menu and parameters while running Linux.
-
-* Install `efibootdude` using `pipx install efibootdude`, or however you do so.
-* Prerequisites: install [rhboot/efibootmgr](https://github.com/rhboot/efibootmgr)
-  * For example, on a Debian derived distro, use `sudo apt install efibootmgr`.
-
-
-`efibootdude` covers only the most commonly used capabilities of `efibootmgr` including:
-* reordering boot entries,
-* removing boot entries,
-* setting the boot entry for the next boot only,
-* setting boot entries active or inactive, and
-* setting the boot menu timeout value (until it boots the default entry).
-
-To be sure, there are many other esoteric uses of `efibootmanager` including adding
-a new boot entry; for such needs, just use `efibootmgr` directly.
-  
-## Usage
-After running `efibootdude` and making some changes, you'll see a screen comparable to this:
-
-![efibootdude-screenshot](https://github.com/joedefen/efibootdude/blob/main/images/efibootdude-screenshot.png?raw=true).
-
-At this point
-* The "current" line starts with `>` and is highlighted.
-* The top line shows actions for the current line; type the underscored letter
-  to effect its action.
-* Type `?` for a more complete explanation of the keys, navigation keys, etc.
-  * **ALWAYS** view the help at least once if unfamiliar with this tool,
-    it navigation, and/or uncertain of keys not shown on top line.
-* With this current line, we can:
-  * Type `u` or `d` to move it up or down in the boot order.
-  * Type `t` to relabel the boot entry.
-  * Type `r` to remove the boot entry.
-  * And so forth.
-* The entries with `*` on the left are active boot entries; toggle whether
-  active by typing `*` for the corresponding entries.
-* Press `ESC` key to abandon any changes and reload the boot information.
-* When ready to write the changes to the BIOS, enter `w`.
-* When the changes look good, type `b` to reboot, if you wish.
-* When writing the changes, `efibootdude` drops out of menu mode so you can
-  verify the underlying commands, error codes, and error messages.
-
-## Caveats
-* Some operations may not work permanently even though there is no indication from `efibootmgr`
-  (e.g., on my desktop, I cannot re-label boot entries).
-* Some operations may only work (again) after re-booting (e.g., you might find activating
-  an entry does not work, but it does so after a reboot).
-
-## About this Project
-This project was inspired by [Elinvention/efiboots](https://github.com/Elinvention/efiboots). Relative to that project, the aims of `efibootdude` are:
-* to be easier to install especially when not in your distro's repos.
-* to clearly present the partition of the boot entries (as a mount point if mounted and, otherwise, the device pathname).
-* to show the underlying commands being run for education, for verification, and for help on investigating issues.

efibootdude-0.5/pyproject.toml

@@ -1,97 +0,0 @@
-# HOW TO DEVELOP
-
-#
-# Prep Work (ensure need modules are up-to-date):
-#   sudo apt install python3-pip
-#   sudo apt install python3-pip-whl
-#   pip install build --break-system-packages
-#   sudo apt install twine
-#   -- antiquated way
-#      sudo pacman -Syu python-pip
-#      sudo pacman -Syu python-build
-#      sudo pacman -Syu python-twine
-#   -- antiquated way
-#      python3 -m pip install --upgrade pip
-#      python3 -m pip install --upgrade build
-#      python3 -m pip install --upgrade twine
-#
-# Optionally, `python3 -m venv venv`, and then
-#   - source env/bin/activate # to activate
-#   - deactivate # to deactivate
-# 
-# rm -rf ./dist && python3 -m build && pip install -e . --break-system-packages
-# pip-tray
-#
-#    -OR-
-# python3 -m efibootdude.main
-#
-#    -OR-
-# cd src/efibootdude && ./main.py
-#
-#    -OR-
-# src/efibootdude/main.py
-
-# HOW TO PUBLISH...
-# PUBLIC Build and deploy (from project directory):
-#   ## BUMP the version (below in [project])
-#   rm -rf dist; python3 -m build; ls dist/.
-#   python3 -m twine upload dist/*     # keyring --disable # may be required
-#     ## Enter __token__ and the saved TOKEN (in bitwarden)
-#   pipx upgrade pwr-tray || pipx install pwr-tray # >= python3.11
-#   --OR-- sudo python3 -m pip install pwr-tray # <= python3.10
-#   ## VISIT  https://pypi.org/project/pwr-tray and delete old versions
-#
-# TEST Build and test (from project directory):
-#   ## BUMP the version (below in [project])
-#   rm -r dist; python3 -m build
-#   python3 -m twine upload --repository testpypi dist/* # keyring --disable # may be required
-#     ## Enter __token__ and the saved TOKEN (in bitwarden)
-#   sudo python3 -m pip install --upgrade --index-url https://test.pypi.org/simple/ --no-deps --break-system-packages my-sna
-#   ## VISIT  https://test.pypi.org/project/pwr-tray and delete old versions
-
-[build-system]
-requires = ["setuptools>=42", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "efibootdude"
-version = "0.5"
-description = "A visual wrapper for efibootmgr"
-authors = [
-    { name = "Joe Defen", email = "joedef@duck.com" }
-]
-readme = "README.md"
-license = { text = "MIT" }
-requires-python = ">=3.8"
-
-keywords = ["app", "installer", "manager", "appimages", ]
-
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: POSIX :: Linux"
-]
-dependencies = [
-    'importlib-metadata; python_version<"3.8"',
-    'psutil>=5.9',
-]
-
-[project.urls]
-"Homepage" = "https://github.com/joedefen/efibootdude"
-"Bug Tracker" = "https://github.com/joedefen/efibootdude/issues"
-
-[project.scripts]
-efibootdude = "efibootdude.main:main"
-
-[tool.setuptools]
-package-dir = {"" = "src"}
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
-[tool.setuptools.package-data]
-
-exclude = [
-    "__pycache__",
-]
-

efibootdude-0.5/setup.cfg

@@ -1,4 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-

efibootdude-0.5/src/efibootdude.egg-info/SOURCES.txt

@@ -1,12 +0,0 @@
-LICENSE
-README.md
-pyproject.toml
-src/efibootdude/PowerWindow.py
-src/efibootdude/__init__.py
-src/efibootdude/main.py
-src/efibootdude.egg-info/PKG-INFO
-src/efibootdude.egg-info/SOURCES.txt
-src/efibootdude.egg-info/dependency_links.txt
-src/efibootdude.egg-info/entry_points.txt
-src/efibootdude.egg-info/requires.txt
-src/efibootdude.egg-info/top_level.txt

efibootdude-0.5/src/efibootdude.egg-info/dependency_links.txt

@@ -1 +0,0 @@
-

efibootdude-0.5/src/efibootdude.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-efibootdude = efibootdude.main:main

efibootdude-0.5/src/efibootdude.egg-info/requires.txt

@@ -1,4 +0,0 @@
-psutil>=5.9
-
-[:python_version < "3.8"]
-importlib-metadata

efibootdude-0.5/src/efibootdude.egg-info/top_level.txt

@@ -1 +0,0 @@
-efibootdude