diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-08 14:49:50 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-08 14:55:12 +0200 |
commit | ea70373de6cf50099d7c5676a57ca14c789dbf69 (patch) | |
tree | cdba2d552907f6667cd081de228ea664e78d644f /initramfs-init.in | |
parent | 9019409e64c5018dbe856728a90d39a764f7e1b2 (diff) | |
download | mkinitfs-ea70373de6cf50099d7c5676a57ca14c789dbf69.tar.bz2 mkinitfs-ea70373de6cf50099d7c5676a57ca14c789dbf69.tar.xz |
init: respect rootflags for tmpfs root too
and warn about root_size. Users should use rootflags instead now.
Diffstat (limited to 'initramfs-init.in')
-rwxr-xr-x | initramfs-init.in | 11 |
1 files 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 '') |