summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2012-10-16 19:10:17 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2012-10-16 19:10:17 -0300
commit21aa378007a97e0679bc8ca05cf3f025ddca0a71 (patch)
tree38b16df96e5ca8720e7a859c7721a343aa6652c7
parent753d2038024541ac2d10f74e6d408d6ed1a23f2a (diff)
[archiso] Allow set copytoram=n for NBD/NFS
On low memory systems installing via PXE is not possible. Do not force copytoram=y for NFS/NDB. Broken/hang things: * On shutdown. * On run-time if some network settings changed. Implements FS#32006. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rw-r--r--archiso/initcpio/hooks/archiso_pxe_nbd5
-rw-r--r--archiso/initcpio/hooks/archiso_pxe_nfs5
2 files changed, 8 insertions, 2 deletions
diff --git a/archiso/initcpio/hooks/archiso_pxe_nbd b/archiso/initcpio/hooks/archiso_pxe_nbd
index a9f84d5..d9bc6d8 100644
--- a/archiso/initcpio/hooks/archiso_pxe_nbd
+++ b/archiso/initcpio/hooks/archiso_pxe_nbd
@@ -27,7 +27,10 @@ archiso_pxe_nbd_mount_handler () {
msg ":: Setup NBD from ${archiso_nbd_srv} at /dev/nbd0"
nbd-client ${archiso_nbd_srv} -N ${archiso_nbd_name} /dev/nbd0
- copytoram="y"
+ if [[ "${copytoram}" != "n" ]]; then
+ copytoram="y"
+ fi
+
archisodevice=/dev/nbd0
archiso_mount_handler ${newroot}
diff --git a/archiso/initcpio/hooks/archiso_pxe_nfs b/archiso/initcpio/hooks/archiso_pxe_nfs
index ef41c01..67874ec 100644
--- a/archiso/initcpio/hooks/archiso_pxe_nfs
+++ b/archiso/initcpio/hooks/archiso_pxe_nfs
@@ -22,6 +22,9 @@ archiso_nfs_mount_handler() {
launch_interactive_shell
fi
- copytoram="y"
+ if [[ "${copytoram}" != "n" ]]; then
+ copytoram="y"
+ fi
+
archiso_mount_handler ${newroot}
}