From ea70373de6cf50099d7c5676a57ca14c789dbf69 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 8 Apr 2015 14:49:50 +0200 Subject: init: respect rootflags for tmpfs root too and warn about root_size. Users should use rootflags instead now. --- initramfs-init.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/initramfs-init.in b/initramfs-init.in index 42ee63f..0e16a73 100755 --- a/initramfs-init.in +++ b/initramfs-init.in @@ -608,11 +608,16 @@ if [ "$SINGLEMODE" = "yes" ]; then fi # mount tmpfs sysroot -root_opts="-o mode=0755" +rootflags="mode=0755" if [ -n "$KOPT_root_size" ]; then - root_opts="$root_opts,size=$KOPT_root_size" + echo "WARNING: the boot option root_size is deprecated. Use rootflags instead" + rootflags="$rootflags,size=$KOPT_root_size" fi -mount -t tmpfs $root_opts tmpfs $sysroot +if [ -n "$KOPT_rootflags" ]; then + rootflags="$rootflags,$KOPT_rootflags" +fi + +mount -t tmpfs -o $rootflags tmpfs $sysroot case "$OVL_DEV" in '') -- cgit v1.2.3