From 6f4832fec1630a8b2b1c1e42d1c98eefddb635d5 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 7 Oct 2014 09:43:53 -0500 Subject: [PATCH] distro_defaults: check for rootfstype parameter --- lib/distro_defaults.cmd | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/distro_defaults.cmd b/lib/distro_defaults.cmd index b8f3c8a..48e6004 100644 --- a/lib/distro_defaults.cmd +++ b/lib/distro_defaults.cmd @@ -29,6 +29,14 @@ for i in 1 2 3 4 5 6 7 ; do echo Using: [root=/dev/mmcblk0p1 ro] ...; fi; fi; + + if test -n ${rootfstype}; then + echo Using: [rootfstype=${rootfstype}] ...; + else + echo Warning: [rootfstype] is not set in /boot/uEnv.txt...; + setenv rootfstype ext4; + echo Using: [rootfstype=ext4] ...; + fi; if test -n ${uname_r}; then setenv bootdir /boot; @@ -81,7 +89,7 @@ for i in 1 2 3 4 5 6 7 ; do if test -n ${set_boot_args}; then run set_boot_args; else - setenv bootargs console=${console} ${optargs} root=${root} rootfstype=${mmcrootfstype} rootwait fixrtc ${systemd} ${cmdline}; + setenv bootargs console=${console} ${optargs} root=${root} rootfstype=${rootfstype} rootwait fixrtc ${systemd} ${cmdline}; fi; echo debug: [${bootargs}] ... ; echo debug: [bootz ${kernel_addr_r} ${ramdisk_addr_r}:${initrd_size} ${fdt_addr_r}] ... ; @@ -94,7 +102,7 @@ for i in 1 2 3 4 5 6 7 ; do if test -n ${set_boot_args}; then run set_boot_args; else - setenv bootargs console=${console} ${optargs} root=${root} rootfstype=${mmcrootfstype} rootwait fixrtc ${systemd} ${cmdline}; + setenv bootargs console=${console} ${optargs} root=${root} rootfstype=${rootfstype} rootwait fixrtc ${systemd} ${cmdline}; fi; echo debug: [${bootargs}] ... ; echo debug: [bootz ${kernel_addr_r} - ${fdt_addr_r}] ... ;