Tweaked refind-mkdefault return values for some error conditions.

diff --git a/docs/man/refind-mkdefault.8 b/docs/man/refind-mkdefault.8
index e8ae0c5d760c38f5cc4f2bcdfbff0c4b4e205f1d..3ac2dde8e3b707befd4c7ee7790f9198b0e063f2 100644 (file)
--- a/docs/man/refind-mkdefault.8
+++ b/docs/man/refind-mkdefault.8
@@ -99,6 +99,12 @@ a buggy EFI or badly damaged NVRAM contents.
 No rEFInd entry could be found in the list of boot options, and so
 no changes were made to the boot order list.
 
 No rEFInd entry could be found in the list of boot options, and so
 no changes were made to the boot order list.
 

+.TP
+.B 4
+The script could not run because of OS issues -- the OS was not Linux,
+the \fIefibootmgr\fR utility was not available, or the script was not run
+as \fIroot\fR.
+

 .SH "LIMITATIONS"
 
 .TP
 .SH "LIMITATIONS"
 
 .TP

diff --git a/refind-mkdefault b/refind-mkdefault
index 39d7ef7e2ed571dbdcaddead32c1ccfda2660a49..a48ac5d237d3b5ab23ad4e66c1c98e2a32f73213 100755 (executable)
--- a/refind-mkdefault
+++ b/refind-mkdefault
@@ -172,13 +172,13 @@ def main():
 
     if sys.platform != "linux":
         print("This program is useful only under Linux; exiting!")
 
     if sys.platform != "linux":
         print("This program is useful only under Linux; exiting!")

-        return(1)
+        return(4)

     if shutil.which("efibootmgr") is None:
         print("The efibootmgr utility is not installed; exiting!")
     if shutil.which("efibootmgr") is None:
         print("The efibootmgr utility is not installed; exiting!")

-        return(1)
+        return(4)

     if not os.geteuid() == 0:
         print("This program must be run as root (or via sudo); exiting!")
     if not os.geteuid() == 0:
         print("This program must be run as root (or via sudo); exiting!")

-        return(1)
+        return(4)

 
     retval = 0
     boot_entries, boot_order = discover_data()
 
     retval = 0
     boot_entries, boot_order = discover_data()