sync mkparabolaiso and initcpios with archiso v46

Signed-off-by: David P <megver83@parabola.nu>

8 files changed, 37 insertions, 33 deletions

diff --git a/parabolaiso/initcpio/install/parabolaiso b/parabolaiso/initcpio/install/parabolaiso
index 30728ef..1e3b3b6 100644
--- a/parabolaiso/initcpio/install/parabolaiso
+++ b/parabolaiso/initcpio/install/parabolaiso
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 build() {
     add_module "cdrom"
@@ -21,10 +23,8 @@ build() {
     add_file /usr/lib/udev/rules.d/10-dm.rules
     add_file /usr/lib/udev/rules.d/95-dm-notify.rules
     add_file /usr/lib/initcpio/udev/11-dm-initramfs.rules /usr/lib/udev/rules.d/11-dm-initramfs.rules
-    if [[ $ARCHISO_GNUPG_FD ]]; then
-        mkdir -p "$BUILDROOT$dest"/gpg
-        gpg --homedir "$BUILDROOT$dest"/gpg --import <&$ARCHISO_GNUPG_FD
+    if [[ $PARABOLAISO_GNUPG_FD ]]; then
+        mkdir -m 0700 -- "$BUILDROOT/gpg"
+        gpg --homedir "$BUILDROOT/gpg" --import <& "$PARABOLAISO_GNUPG_FD"
     fi
 }
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/parabolaiso/initcpio/install/parabolaiso_kms b/parabolaiso/initcpio/install/parabolaiso_kms
index 3ff31f3..8129127 100644
--- a/parabolaiso/initcpio/install/parabolaiso_kms
+++ b/parabolaiso/initcpio/install/parabolaiso_kms
@@ -1,9 +1,13 @@
-#!/bin/bash
+#!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 build() {
+    add_module "amdgpu"
     add_module "radeon"
     add_module "nouveau"
     add_module "i915"
+    add_module "mgag200"
     add_module "via-agp"
     add_module "sis-agp"
     add_module "intel-agp"
diff --git a/parabolaiso/initcpio/install/parabolaiso_loop_mnt b/parabolaiso/initcpio/install/parabolaiso_loop_mnt
index 59f1d94..1f2c529 100644
--- a/parabolaiso/initcpio/install/parabolaiso_loop_mnt
+++ b/parabolaiso/initcpio/install/parabolaiso_loop_mnt
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 build() {
     add_runscript
@@ -9,5 +11,3 @@ cat<<HELPEOF
   This hook loads the necessary modules for boot via loop device.
 HELPEOF
 }
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/parabolaiso/initcpio/install/parabolaiso_pxe_common b/parabolaiso/initcpio/install/parabolaiso_pxe_common
index eec9a7e..458fa69 100644
--- a/parabolaiso/initcpio/install/parabolaiso_pxe_common
+++ b/parabolaiso/initcpio/install/parabolaiso_pxe_common
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 build() {
     add_checked_modules -f "(irda|phy|wimax|wireless|ppp_|plip|pppoe)" "/drivers/net/"
@@ -8,13 +10,13 @@ build() {
     add_binary /usr/lib/initcpio/ipconfig /bin/ipconfig
 
     # Add hosts support files+dns
-    add_symlink /usr/lib/libnss_files.so.2 $(readlink /usr/lib/libnss_files.so.2)
-    add_binary $(readlink -f /usr/lib/libnss_files.so.2)
-    add_symlink /usr/lib/libnss_dns.so.2 $(readlink /usr/lib/libnss_dns.so.2)
-    add_binary $(readlink -f /usr/lib/libnss_dns.so.2)
+    add_symlink /usr/lib/libnss_files.so.2 "$(readlink /usr/lib/libnss_files.so.2)"
+    add_binary "$(readlink -f /usr/lib/libnss_files.so.2)"
+    add_symlink /usr/lib/libnss_dns.so.2 "$(readlink /usr/lib/libnss_dns.so.2)"
+    add_binary "$(readlink -f /usr/lib/libnss_dns.so.2)"
 
     add_dir /etc
-    echo "hosts: files dns" > $BUILDROOT/etc/nsswitch.conf
+    echo "hosts: files dns" > "$BUILDROOT/etc/nsswitch.conf"
 }
 
 help() {
@@ -22,5 +24,3 @@ cat<<HELPEOF
   This hook loads the necessary modules for boot via PXE.
 HELPEOF
 }
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/parabolaiso/initcpio/install/parabolaiso_pxe_http b/parabolaiso/initcpio/install/parabolaiso_pxe_http
index 9ce9726..1e80852 100644
--- a/parabolaiso/initcpio/install/parabolaiso_pxe_http
+++ b/parabolaiso/initcpio/install/parabolaiso_pxe_http
@@ -1,11 +1,13 @@
-#!/bin/bash
+#!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 build() {
     add_runscript
 
     add_binary curl
 
-    add_file $(readlink -f /etc/ssl/certs/ca-certificates.crt) /etc/ssl/certs/ca-certificates.crt
+    add_file "$(readlink -f /etc/ssl/certs/ca-certificates.crt)" /etc/ssl/certs/ca-certificates.crt
 }
 
 help() {
@@ -13,5 +15,3 @@ cat<<HELPEOF
   This hook loads the necessary modules for boot via PXE and HTTP.
 HELPEOF
 }
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/parabolaiso/initcpio/install/parabolaiso_pxe_nbd b/parabolaiso/initcpio/install/parabolaiso_pxe_nbd
index 47d98ce..b4fb3b6 100644
--- a/parabolaiso/initcpio/install/parabolaiso_pxe_nbd
+++ b/parabolaiso/initcpio/install/parabolaiso_pxe_nbd
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 build() {
     add_module "nbd"
@@ -13,5 +15,3 @@ cat<<HELPEOF
   This hook loads the necessary modules for boot via PXE and NBD.
 HELPEOF
 }
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/parabolaiso/initcpio/install/parabolaiso_pxe_nfs b/parabolaiso/initcpio/install/parabolaiso_pxe_nfs
index f8226e5..efd609d 100644
--- a/parabolaiso/initcpio/install/parabolaiso_pxe_nfs
+++ b/parabolaiso/initcpio/install/parabolaiso_pxe_nfs
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 build() {
     add_module "nfs"
@@ -13,5 +15,3 @@ help() {
   This hook loads the necessary modules for boot via PXE and NFS.
 HELPEOF
 }
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/parabolaiso/initcpio/install/parabolaiso_shutdown b/parabolaiso/initcpio/install/parabolaiso_shutdown
index d7bffa7..f99c8c9 100644
--- a/parabolaiso/initcpio/install/parabolaiso_shutdown
+++ b/parabolaiso/initcpio/install/parabolaiso_shutdown
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 build() {
     add_binary cp
@@ -12,9 +14,7 @@ help() {
     cat <<HELPEOF
 This hook will create a shutdown initramfs in /run/initramfs
 that we can pivot to on shutdown in order to unmount / and
-and others mount points, dm-snapshot devices and loopback devices.
-Mostly usefull for dm-snapshot persistent.
+and other mount points, dm-snapshot and loopback devices.
+Mostly useful for persistent dm-snapshot.
 HELPEOF
 }
-
-# vim: set ft=sh ts=4 sw=4 et: