[arch-releng] [PATCH 12/12] Rename ramdisk_size parameter to tmpfs_size to avoid conflict

[Gerardo Exequiel Pozzi]

Rename ramdisk_size parameter to tmpfs_size to avoid conflict with
the kernel parameter that is for old ramdisk based blockdevs (/dev/ramN)
and confusion to users.

The kernel parameter ramdisk_size=N is in "N * k size", while tmpfs
size=N is in "N * [ k | m | g ] byte size" or "in N% of RAM",
like is used by default on archiso.

This parameter is used only for tmpfs in size option.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
---
 archiso/hooks/archiso                              |    8 ++++----
 configs/default/menu.lst                           |    2 +-
 configs/install-iso/boot-files/grub/menu.lst       |    4 ++--
 .../install-iso/boot-files/isolinux/isolinux.cfg   |    4 ++--
 configs/xfce4/overlay/boot/grub/menu.lst           |    2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso
index aeaded2..cf13e3d 100644
--- a/archiso/hooks/archiso
+++ b/archiso/hooks/archiso
@@ -46,8 +46,8 @@ run_hook ()
         arch="$(uname -m)"
     fi
 
-    if [ "x${ramdisk_size}" = "x" ]; then
-        ramdisk_size="75%"
+    if [ "x${tmpfs_size}" = "x" ]; then
+        tmpfs_size="75%"
     fi
 
     if [ "x${isomounts}" != "x" ]; then
@@ -56,8 +56,8 @@ run_hook ()
         isomounts="/bootmnt/isomounts"
     fi
 
-    msg -n ":: Mounting tmpfs, size=${ramdisk_size}..."
-    mount -t tmpfs -o "size=${ramdisk_size}" tmpfs /tmpfs
+    msg -n ":: Mounting tmpfs, size=${tmpfs_size}..."
+    mount -t tmpfs -o "size=${tmpfs_size}" tmpfs /tmpfs
     msg "done."
 
     msg ":: Waiting for boot device..."
diff --git a/configs/default/menu.lst b/configs/default/menu.lst
index 0852720..8cad364 100644
--- a/configs/default/menu.lst
+++ b/configs/default/menu.lst
@@ -4,7 +4,7 @@ color light-blue/blue black/light-grey
 splashimage=/boot/splash.xpm.gz
 
 title  Boot Arch Linux Live CD
-kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75%
+kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 tmpfs_size=75%
 initrd /boot/archiso.img
 
 title  Shutdown the Computer
diff --git a/configs/install-iso/boot-files/grub/menu.lst b/configs/install-iso/boot-files/grub/menu.lst
index 41a72f9..07bfd71 100644
--- a/configs/install-iso/boot-files/grub/menu.lst
+++ b/configs/install-iso/boot-files/grub/menu.lst
@@ -4,11 +4,11 @@ color light-blue/blue black/light-grey
 splashimage=/boot/splash.xpm.gz
 
 title  Boot Arch Linux Live CD
-kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 archisolabel=XXX ramdisk_size=75%
+kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 archisolabel=XXX tmpfs_size=75%
 initrd /boot/archiso_pata.img
 
 title  Boot Arch Linux Live CD [Legacy IDE, no SATA]
-kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 archisolabel=XXX ramdisk_size=75%
+kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 archisolabel=XXX tmpfs_size=75%
 initrd /boot/archiso_ide.img
 
 title Release Notes
diff --git a/configs/install-iso/boot-files/isolinux/isolinux.cfg b/configs/install-iso/boot-files/isolinux/isolinux.cfg
index 793271e..5686af3 100644
--- a/configs/install-iso/boot-files/isolinux/isolinux.cfg
+++ b/configs/install-iso/boot-files/isolinux/isolinux.cfg
@@ -8,11 +8,11 @@ DEFAULT arch
 
 LABEL arch
 KERNEL /boot/vmlinuz26
-APPEND lang=en locale=en_US.UTF-8 archisolabel=XXX ramdisk_size=75% initrd=/boot/archiso_pata.img
+APPEND lang=en locale=en_US.UTF-8 archisolabel=XXX tmpfs_size=75% initrd=/boot/archiso_pata.img
 
 LABEL archide
 KERNEL /boot/vmlinuz26
-APPEND lang=en locale=en_US.UTF-8 archisolabel=XXX ramdisk_size=75% initrd=/boot/archiso_ide.img
+APPEND lang=en locale=en_US.UTF-8 archisolabel=XXX tmpfs_size=75% initrd=/boot/archiso_ide.img
 
 LABEL memtest
 KERNEL /boot/memtest
diff --git a/configs/xfce4/overlay/boot/grub/menu.lst b/configs/xfce4/overlay/boot/grub/menu.lst
index 4cd24a3..a9c964a 100644
--- a/configs/xfce4/overlay/boot/grub/menu.lst
+++ b/configs/xfce4/overlay/boot/grub/menu.lst
@@ -4,7 +4,7 @@ color light-blue/blue black/light-grey
 splashimage=/boot/splash.xpm.gz
 
 title  Boot Arch Linux Live CD
-kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75%
+kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 tmpfs_size=75%
 initrd /boot/archiso.img
 
 title Tools...
-- 
1.6.5.2