From 5a8a8c7b104ee4acf0533bda469c56b45db2afc3 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Fri, 8 Aug 2014 09:13:01 +0200 Subject: Reintroduce the possibility to force an architecture Among other things, 36459f3 ([archiso] Drop aitab support, 2014-06-28) removed the possibility to manually set a specific architecture by using kernel parameters. This, however, is useful, e.g. when installing Arch Linux on a device that reports itself as i586 but works fine with the i686 flavor. Signed-off-by: Lukas Fleischer --- archiso/initcpio/hooks/archiso | 2 +- docs/README.bootparams | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso index 26bdedc..4c50566 100644 --- a/archiso/initcpio/hooks/archiso +++ b/archiso/initcpio/hooks/archiso @@ -101,7 +101,7 @@ _verify_checksum() { } run_hook() { - arch="$(uname -m)" + [[ -z "${arch}" ]] && arch="$(uname -m)" [[ -z "${cowspace_size}" ]] && cowspace_size="75%" [[ -z "${copytoram_size}" ]] && copytoram_size="75%" [[ -z "${archisobasedir}" ]] && archisobasedir="arch" diff --git a/docs/README.bootparams b/docs/README.bootparams index caee0c2..08198cb 100644 --- a/docs/README.bootparams +++ b/docs/README.bootparams @@ -57,6 +57,9 @@ INDEX Default: "75%" * dm_snap_prefix= Set a prefix for device-mapper snapshot node names. Default: "arch" +* arch= Force an architecture type (i686 | x86_64). + Do not set it for normal operations. + Default: (architecture of running kernel) ** hooks/archiso_pxe_common -- cgit v1.2.3-54-g00ecf