Rename ramdisk_size parameter to tmpfs_size to avoid conflict

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@yahoo.com.ar>
This commit is contained in:
Gerardo Exequiel Pozzi 2009-11-16 23:54:51 -03:00
parent e87ffdfa3c
commit ed97ef03a4
5 changed files with 10 additions and 10 deletions

View File

@ -46,8 +46,8 @@ run_hook ()
arch="$(uname -m)" arch="$(uname -m)"
fi fi
if [ "x${ramdisk_size}" = "x" ]; then if [ "x${tmpfs_size}" = "x" ]; then
ramdisk_size="75%" tmpfs_size="75%"
fi fi
if [ "x${isomounts}" != "x" ]; then if [ "x${isomounts}" != "x" ]; then
@ -56,8 +56,8 @@ run_hook ()
isomounts="/bootmnt/isomounts" isomounts="/bootmnt/isomounts"
fi fi
msg -n ":: Mounting tmpfs, size=${ramdisk_size}..." msg -n ":: Mounting tmpfs, size=${tmpfs_size}..."
mount -t tmpfs -o "size=${ramdisk_size}" tmpfs /tmpfs mount -t tmpfs -o "size=${tmpfs_size}" tmpfs /tmpfs
msg "done." msg "done."
msg ":: Waiting for boot device..." msg ":: Waiting for boot device..."

View File

@ -4,7 +4,7 @@ color light-blue/blue black/light-grey
splashimage=/boot/splash.xpm.gz splashimage=/boot/splash.xpm.gz
title Boot Arch Linux Live CD 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 initrd /boot/archiso.img
title Shutdown the Computer title Shutdown the Computer

View File

@ -4,11 +4,11 @@ color light-blue/blue black/light-grey
splashimage=/boot/splash.xpm.gz splashimage=/boot/splash.xpm.gz
title Boot Arch Linux Live CD 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 initrd /boot/archiso_pata.img
title Boot Arch Linux Live CD [Legacy IDE, no SATA] 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 initrd /boot/archiso_ide.img
title Release Notes title Release Notes

View File

@ -8,11 +8,11 @@ DEFAULT arch
LABEL arch LABEL arch
KERNEL /boot/vmlinuz26 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 LABEL archide
KERNEL /boot/vmlinuz26 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 LABEL memtest
KERNEL /boot/memtest KERNEL /boot/memtest

View File

@ -4,7 +4,7 @@ color light-blue/blue black/light-grey
splashimage=/boot/splash.xpm.gz splashimage=/boot/splash.xpm.gz
title Boot Arch Linux Live CD 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 initrd /boot/archiso.img
title Tools... title Tools...