Commit fa48377c authored by David Runge's avatar David Runge
Browse files

Merge remote-tracking branch 'sxw/copytoram'

* sxw/copytoram:
  Apply copytoram Boot Option Menu Entries also to releng
  Fence add_binary for pv
  Reorder UEFI boot menu entries
  Update README.bootparams
  Apply 1 suggestion(s) to 1 file(s)
  add optional pv tool
parents 3a5877d9 756c9dbe
...@@ -24,7 +24,9 @@ INDEX ...@@ -24,7 +24,9 @@ INDEX
* archisobasedir= Set the base directory where all files reside. * archisobasedir= Set the base directory where all files reside.
Default: "arch" Default: "arch"
* copytoram= If set to "y" or just "copytoram" without arguments, * copytoram= If set to "y" or just "copytoram" without arguments,
all SquashFS are copied to "RAM". all SquashFS are copied to "RAM". If you add the package
"pv" to the packages.x86_64 it is used to display the copy
progress.
Default: (unset) Default: (unset)
* checksum= If set to "y" or just "checksum" without arguments, * checksum= If set to "y" or just "checksum" without arguments,
performs a self-test of all files inside ${install_dir}, performs a self-test of all files inside ${install_dir},
......
...@@ -69,10 +69,23 @@ _mnt_sfs() { ...@@ -69,10 +69,23 @@ _mnt_sfs() {
# defined via initcpio's parse_cmdline() # defined via initcpio's parse_cmdline()
if [ "${copytoram}" = "y" ]; then if [ "${copytoram}" = "y" ]; then
msg -n ":: Copying squashfs image to RAM..." msg -n ":: Copying squashfs image to RAM..."
if ! cp -- "${img}" "/run/archiso/copytoram/${img_fullname}" ; then
# in case we have pv use it to display copy progress feedback otherwise
# fallback to using plain cp
if command -v pv > /dev/null 2>&1; then
echo ""
(pv "${img}" > "/run/archiso/copytoram/${img_fullname}")
local rc=$?
else
(cp -- "${img}" "/run/archiso/copytoram/${img_fullname}")
local rc=$?
fi
if [ $rc != 0 ]; then
echo "ERROR: while copy '${img}' to '/run/archiso/copytoram/${img_fullname}'" echo "ERROR: while copy '${img}' to '/run/archiso/copytoram/${img_fullname}'"
launch_interactive_shell launch_interactive_shell
fi fi
img="/run/archiso/copytoram/${img_fullname}" img="/run/archiso/copytoram/${img_fullname}"
msg "done." msg "done."
fi fi
......
...@@ -19,6 +19,12 @@ build() { ...@@ -19,6 +19,12 @@ build() {
add_binary gpg add_binary gpg
add_binary grep add_binary grep
if command -v pv > /dev/null 2>&1; then
add_binary pv
else
warning 'pv not found; falling back to cp for copy to RAM'
fi
add_file /usr/lib/udev/rules.d/60-cdrom_id.rules add_file /usr/lib/udev/rules.d/60-cdrom_id.rules
add_file /usr/lib/udev/rules.d/10-dm.rules 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/udev/rules.d/95-dm-notify.rules
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment