From 05758c185f13524c6cebc6ada61ffee713d85412 Mon Sep 17 00:00:00 2001
From: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Date: Thu, 31 Jan 2013 03:34:48 -0300
Subject: [PATCH] [archiso] docs/* update
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
---
docs/README.altbootmethods | 23 ++++++++++-------------
docs/README.transfer | 13 +++++--------
2 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/docs/README.altbootmethods b/docs/README.altbootmethods
index ebe1c6e4..3dc8a2c8 100644
--- a/docs/README.altbootmethods
+++ b/docs/README.altbootmethods
@@ -13,33 +13,30 @@ INDEX
*** Alternative boot methods (configs/releng)
-ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
+ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-dual.iso
Where:
<YYYY> Year
<MM> Month
<DD> Day
- <ARCH> i686 | x86_64 | dual(*)
-
-(*) "dual" includes both i686 and x86_64 architectures.
** ISO in loopback mode.
Note: Described method is for using with GRUB2.
- GRUB2 is installed on target media and archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
+ GRUB2 is installed on target media and archlinux-<YYYY>.<MM>.<DD>-dual.iso
is at path <TARGET-PATH> on disk <D> and partition <P>,
where filesystem is labeled as <TARGET-FS-LABEL>.
menuentry "Arch Linux (x86_64)" {
- set isofile="/<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso"
+ set isofile="/<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-dual.iso"
loopback loop (hd<D>,<P>)$isofile
linux (loop)/arch/boot/x86_64/vmlinuz archisolabel=<FS-LABEL> img_label=<TARGET-FS-LABEL> img_loop=$isofile
initrd (loop)/arch/boot/x86_64/archiso.img
}
menuentry "Arch Linux (i686)" {
- set isofile="/<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso"
+ set isofile="/<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-dual.iso"
loopback loop (hd<D>,<P>)$isofile
linux (loop)/arch/boot/i686/vmlinuz archisolabel=<FS-LABEL> img_label=<TARGET-FS-LABEL> img_loop=$isofile
initrd (loop)/arch/boot/i686/archiso.img
@@ -50,7 +47,7 @@ menuentry "Arch Linux (i686)" {
Note: Described method is for using with SYSLINUX. Anyway MEMDISK from SYSLINUX can work
with other bootloaders.
- SYSLINUX is installed on target media and archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
+ SYSLINUX is installed on target media and archlinux-<YYYY>.<MM>.<DD>-dual.iso
is at path <TARGET-PATH>.
On 32-bit systems, is needed to pass vmalloc=nnM to the kernel, where nn is the size
of the ISO image plus 64 MiB (or 128 MiB).
@@ -58,12 +55,12 @@ Note: Described method is for using with SYSLINUX. Anyway MEMDISK from SYSLINUX
LABEL arch_x64
LINUX memdisk
- INITRD /<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
+ INITRD /<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-dual.iso
APPEND iso
LABEL arch_x32
LINUX memdisk
- INITRD /<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
+ INITRD /<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-dual.iso
APPEND iso
@@ -112,17 +109,17 @@ methods can be used to serve the rest of live-medium.
* NFS
# echo "/run/archiso/bootmnt 192.168.0.*(ro,no_subtree_check,no_root_squash)" >> /etc/exports
-# rc.d start rpcbind nfs-common nfs-server
+# systemctl start rpc-mountd.service
* NBD
-Note: Adjust ARCH_201207 as needed.
+Note: Adjust ARCH_201302 as needed.
# cat << EOF > /tmp/nbd-server.conf
[generic]
[archiso]
readonly = true
- exportname = /dev/disk/by-label/ARCH_201207
+ exportname = /dev/disk/by-label/ARCH_201302
EOF
# nbd-server -C /tmp/nbd-server.conf
diff --git a/docs/README.transfer b/docs/README.transfer
index 05073979..d3ec720c 100644
--- a/docs/README.transfer
+++ b/docs/README.transfer
@@ -12,15 +12,12 @@ INDEX
*** Transfer ISO image to target medium (configs/releng)
-ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
+ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-dual.iso
Where:
<YYYY> Year
<MM> Month
<DD> Day
- <ARCH> i686 | x86_64 | dual(*)
-
-(*) "dual" includes both i686 and x86_64 architectures.
** To -> CD / DVD / BD
@@ -36,7 +33,7 @@ Nomeclature:
1) Write it directly using your favorite recording program.
-# cdrecord dev=<B>,<T>,<L> -dao archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
+# cdrecord dev=<B>,<T>,<L> -dao archlinux-<YYYY>.<MM>.<DD>-dual.iso
** To -> USB Flash Drive (USB-key) / Memory card (SD) /
@@ -55,10 +52,10 @@ Nomeclature:
(example: /dev/sdx1)
<MNT-TARGET-N>: Mount point path where <DEV-TARGET-N> is mounted
(example: /mnt/sdx/1)
-<ISO-SOURCE>: Path to the ISO file archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
- (example: ~/archlinux-2012.07.22-x86_64.iso)
+<ISO-SOURCE>: Path to the ISO file archlinux-<YYYY>.<MM>.<DD>-dual.iso
+ (example: ~/archlinux-2012.07.22-dual.iso)
<FS-LABEL>: Represents the filesystem label of the <ISO-SOURCE>
- (example: ARCH_201207 [for all ~/archlinux-2012.07.*.iso])
+ (example: ARCH_201302)
* PC-BIOS (MBR):
--
GitLab