Merge pull request #33 from tecknicaltom/skip-gpg

Don't build gpg if using LUKS passphrase
sakaki- · Jul 25, 2020 · 76e2081 · 76e2081
2 parents 56d346f + acb277b
commit 76e2081
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/buildkernel b/buildkernel
@@ -1916,16 +1916,18 @@ build_static_gpg() {
     emerge ${VERBOSITYFLAG} "app-crypt/staticgpg"
 }
 modify_initramfs() {
-    if [ ! -x "${GPG1PATHFROM}" ]; then
-        if ((ARG_ASK==1)); then
-            continue_yn "No static gpg found, would you like to build it?"
-        else
-            show "No static gpg found, so creating one..."
+    if [ -n "${LUKSKEYFILE}" ]; then
+        if [ ! -x "${GPG1PATHFROM}" ]; then
+            if ((ARG_ASK==1)); then
+                continue_yn "No static gpg found, would you like to build it?"
+            else
+                show "No static gpg found, so creating one..."
+            fi
+            build_static_gpg
         fi
-        build_static_gpg
+        show "Copying static gpg program into initramfs..."
+        cp ${VERBOSITYFLAG} "${GPG1PATHFROM}" "${GPG1PATHTO}"
     fi
-    show "Copying static gpg program into initramfs..."
-    cp ${VERBOSITYFLAG} "${GPG1PATHFROM}" "${GPG1PATHTO}"
 
     if ((USINGMODULES==1)); then
         show "Copying contents of ${MODPROBEDIR} directory into initramfs..."