ソースを参照

Update utils.ipxe

changes in testpr:
* clarification of variables: github_hash -> github_branch_or_hash
* 'hash' is now 'commit hash'
* 'User' or 'User Name' is now 'username'
* other innocuous text changes

utils.ipxe refers to the 'main_menu' label in line 134 even though there's no main_menu label defined in utils.ipxe. Will this fail or is iPXE aware of the 'main_menu' label in file main.ipxe line 34?
Firminator 7 年 前
コミット
13e42846bb
1 ファイル変更11 行追加11 行削除
  1. 11 11
      src/utils.ipxe

+ 11 - 11
src/utils.ipxe

@@ -15,9 +15,9 @@ item supergrub ${space} Super Grub2 Disk
 item sysrcd ${space} SystemRescueCD
 item ubcd ${space} Ultimate Boot CD (UBCD)
 item --gap netboot.xyz tools:
-item nbxyz-custom ${space} Set Github User [user: ${github_user}]
+item nbxyz-custom ${space} Set Github username [user: ${github_user}]
 item testdistro ${space} Test Distribution ISO
-item testpr ${space} Test netboot.xyz branch
+item testpr ${space} Test forked netboot.xyz branch or hash
 choose --default ${menu} menu || goto utils_exit
 echo ${cls}
 goto ${menu} ||
@@ -146,7 +146,7 @@ goto utils_exit
 
 :testdistro
 echo This option will allow you to test booting an ISO using memdisk. Please
-echo specify the url of the ISO you want to test and it will automatically
+echo specify the URL of the ISO you want to test and it will automatically
 echo attempt to load the ISO using memdisk.
 echo -n URL: ${} && read distro_iso
 kernel ${memdisk} iso raw
@@ -156,17 +156,17 @@ goto utils_exit
 
 :testpr
 clear github_user
-clear github_hash
-echo This will chainload into a testing branch of netboot.xyz.  You'll need to enter
-echo your Github User and the first part of the commit hash of the commit you want
-echo to test or the branch name.  This assumes you are testing from a netboot.xyz 
+clear github_branch_or_hash
+echo This will chainload into a testing branch of netboot.xyz. You'll need to enter
+echo your Github username and the first part of the commit hash of the commit you want
+echo to test or the branch name. This assumes you are testing from a forked netboot.xyz
 echo repo.
 echo
-echo -n Specify Github User Name: ${} && read github_user
-echo -n Specify branch name or hash ( i.e. my_feature or 30b7ca ): ${} && read github_hash
+echo -n Specify Github username: ${} && read github_user
+echo -n Specify Github branch name or commit hash ( i.e. my_feature or 30b7ca ): ${} && read github_branch_or_hash
 echo
-echo Attempting to chainload:
-chain --autofree https://raw.githubusercontent.com/${github_user}/netboot.xyz/${github_hash}/src/menu.ipxe || echo Unable to find branch... && sleep 5 && goto utils_exit
+echo Attempting to chainload branch or hash:
+chain --autofree https://raw.githubusercontent.com/${github_user}/netboot.xyz/${github_branch_or_hash}/src/menu.ipxe || echo Unable to find Github branch or hash... && sleep 5 && goto utils_exit
 goto utils_exit
 
 :utils_exit