[update] : Added v47 initcpio

diff --git a/system/initcpio/hooks/archiso b/system/initcpio/hooks/archiso
index 7f2f9a7..716c69e 100644 (file)
--- a/system/initcpio/hooks/archiso
+++ b/system/initcpio/hooks/archiso
@@ -1,4 +1,6 @@
 #!/bin/ash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # args: source, newroot, mountpoint
 _mnt_dmsnapshot() {
@@ -12,7 +14,7 @@ _mnt_dmsnapshot() {
 
     ro_dev="$(losetup --find --show --read-only -- "${img}")"
     echo "${ro_dev}" >> /run/archiso/used_block_devices
-    ro_dev_size="$(blockdev --getsz -- "${ro_dev}")"
+    ro_dev_size="$(blockdev --getsz "${ro_dev}")"
 
     if [ "${cow_persistent}" = "P" ]; then
         if [ -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" ]; then

diff --git a/system/initcpio/hooks/archiso_loop_mnt b/system/initcpio/hooks/archiso_loop_mnt
index 2c607f5..41899e4 100644 (file)
--- a/system/initcpio/hooks/archiso_loop_mnt
+++ b/system/initcpio/hooks/archiso_loop_mnt
@@ -1,4 +1,6 @@
 #!/bin/ash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 run_hook () {
     # shellcheck disable=SC2154

diff --git a/system/initcpio/hooks/archiso_pxe_common b/system/initcpio/hooks/archiso_pxe_common
index bf8e883..f02ef12 100644 (file)
--- a/system/initcpio/hooks/archiso_pxe_common
+++ b/system/initcpio/hooks/archiso_pxe_common
@@ -1,4 +1,6 @@
 #!/bin/ash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 run_hook () {
     # Do *not* declare 'bootif_dev' local! We need it in run_latehook().

diff --git a/system/initcpio/hooks/archiso_pxe_http b/system/initcpio/hooks/archiso_pxe_http
index bf2f5f4..efae923 100644 (file)
--- a/system/initcpio/hooks/archiso_pxe_http
+++ b/system/initcpio/hooks/archiso_pxe_http
@@ -1,4 +1,6 @@
 #!/bin/ash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 run_hook() {
     # shellcheck disable=SC2154

diff --git a/system/initcpio/hooks/archiso_pxe_nbd b/system/initcpio/hooks/archiso_pxe_nbd
index 4ccbcbf..8ac44e7 100644 (file)
--- a/system/initcpio/hooks/archiso_pxe_nbd
+++ b/system/initcpio/hooks/archiso_pxe_nbd
@@ -1,4 +1,6 @@
 #!/bin/ash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 run_earlyhook() {
     # shellcheck disable=SC2154

diff --git a/system/initcpio/hooks/archiso_pxe_nfs b/system/initcpio/hooks/archiso_pxe_nfs
index be1e4c3..9d3964b 100644 (file)
--- a/system/initcpio/hooks/archiso_pxe_nfs
+++ b/system/initcpio/hooks/archiso_pxe_nfs
@@ -1,4 +1,6 @@
 #!/bin/ash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 run_hook() {
     # shellcheck disable=SC2154

diff --git a/system/initcpio/hooks/archiso_shutdown b/system/initcpio/hooks/archiso_shutdown
index db8fb33..ebb6b11 100644 (file)
--- a/system/initcpio/hooks/archiso_shutdown
+++ b/system/initcpio/hooks/archiso_shutdown
@@ -1,4 +1,6 @@
 #!/bin/ash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 run_cleanuphook() {
     rm -rf /usr/lib/modules

diff --git a/system/initcpio/install/archiso_kms b/system/initcpio/install/archiso_kms
index 48832ff..8129127 100644 (file)
--- a/system/initcpio/install/archiso_kms
+++ b/system/initcpio/install/archiso_kms
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 build() {
     add_module "amdgpu"

diff --git a/system/initcpio/install/archiso_loop_mnt b/system/initcpio/install/archiso_loop_mnt
index 4a5824d..1f2c529 100644 (file)
--- a/system/initcpio/install/archiso_loop_mnt
+++ b/system/initcpio/install/archiso_loop_mnt
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 build() {
     add_runscript

diff --git a/system/initcpio/install/archiso_pxe_common b/system/initcpio/install/archiso_pxe_common
index da5f6b6..458fa69 100644 (file)
--- a/system/initcpio/install/archiso_pxe_common
+++ b/system/initcpio/install/archiso_pxe_common
@@ -1,4 +1,6 @@
 #!/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/"

diff --git a/system/initcpio/install/archiso_pxe_http b/system/initcpio/install/archiso_pxe_http
index 3353eb7..1e80852 100644 (file)
--- a/system/initcpio/install/archiso_pxe_http
+++ b/system/initcpio/install/archiso_pxe_http
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 build() {
     add_runscript

diff --git a/system/initcpio/install/archiso_pxe_nbd b/system/initcpio/install/archiso_pxe_nbd
index 9fe3fdd..b4fb3b6 100644 (file)
--- a/system/initcpio/install/archiso_pxe_nbd
+++ b/system/initcpio/install/archiso_pxe_nbd
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 build() {
     add_module "nbd"

diff --git a/system/initcpio/install/archiso_pxe_nfs b/system/initcpio/install/archiso_pxe_nfs
index fa4e548..efd609d 100644 (file)
--- a/system/initcpio/install/archiso_pxe_nfs
+++ b/system/initcpio/install/archiso_pxe_nfs
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 build() {
     add_module "nfs"

diff --git a/system/initcpio/install/archiso_shutdown b/system/initcpio/install/archiso_shutdown
index 1051d1b..b2c6bd4 100644 (file)
--- a/system/initcpio/install/archiso_shutdown
+++ b/system/initcpio/install/archiso_shutdown
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 build() {
     add_binary cp

diff --git a/system/initcpio/script/archiso_shutdown b/system/initcpio/script/archiso_shutdown
index 4a0c7dc..23a8a79 100644 (file)
--- a/system/initcpio/script/archiso_shutdown
+++ b/system/initcpio/script/archiso_shutdown
@@ -1,4 +1,6 @@
 #!/bin/ash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # /oldroot depends on things inside /oldroot/run/archiso...
 mkdir /oldrun