From 4524f00cf9920b972b21c9ecefe3b5570354f27c Mon Sep 17 00:00:00 2001 From: hayao Date: Fri, 2 Oct 2020 21:03:45 +0900 Subject: [PATCH] [update] : Added v47 initcpio --- system/initcpio/hooks/archiso | 4 +++- system/initcpio/hooks/archiso_loop_mnt | 2 ++ system/initcpio/hooks/archiso_pxe_common | 2 ++ system/initcpio/hooks/archiso_pxe_http | 2 ++ system/initcpio/hooks/archiso_pxe_nbd | 2 ++ system/initcpio/hooks/archiso_pxe_nfs | 2 ++ system/initcpio/hooks/archiso_shutdown | 2 ++ system/initcpio/install/archiso_kms | 2 ++ system/initcpio/install/archiso_loop_mnt | 2 ++ system/initcpio/install/archiso_pxe_common | 2 ++ system/initcpio/install/archiso_pxe_http | 2 ++ system/initcpio/install/archiso_pxe_nbd | 2 ++ system/initcpio/install/archiso_pxe_nfs | 2 ++ system/initcpio/install/archiso_shutdown | 2 ++ system/initcpio/script/archiso_shutdown | 2 ++ 15 files changed, 31 insertions(+), 1 deletion(-) diff --git a/system/initcpio/hooks/archiso b/system/initcpio/hooks/archiso index 7f2f9a7e..716c69e6 100644 --- 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 2c607f50..41899e46 100644 --- 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 bf8e8838..f02ef126 100644 --- 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 bf2f5f40..efae9239 100644 --- 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 4ccbcbf4..8ac44e71 100644 --- 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 be1e4c35..9d3964b0 100644 --- 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 db8fb336..ebb6b110 100644 --- 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 48832ff7..81291279 100644 --- 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 4a5824db..1f2c5299 100644 --- 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 da5f6b69..458fa699 100644 --- 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 3353eb7f..1e80852a 100644 --- 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 9fe3fdd0..b4fb3b60 100644 --- 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 fa4e548e..efd609de 100644 --- 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 1051d1b4..b2c6bd47 100644 --- 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 4a0c7dcf..23a8a798 100644 --- 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 -- 2.11.0