From 4482c12b5180b628f5d4f1812492830f8008bea1 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 7 Oct 2014 10:12:32 -0500 Subject: [PATCH] Revert "distro_defaults: allow root over mmcroot (ssd's)" This reverts commit b4c18af5fb5b5545a94f2476ff84833365193d05. Signed-off-by: Robert Nelson --- lib/distro_defaults.cmd | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/distro_defaults.cmd b/lib/distro_defaults.cmd index 2ef4a88..48e6004 100644 --- a/lib/distro_defaults.cmd +++ b/lib/distro_defaults.cmd @@ -22,16 +22,11 @@ for i in 1 2 3 4 5 6 7 ; do echo Warning: [uuid] is not set in /boot/uEnv.txt ...; if test -n ${mmcroot}; then setenv root ${mmcroot} ro; - echo Using: [root=${mmcroot}] ...; + echo Using: [root=${mmcroot} ro] ...; else - if test -n ${root}; then - setenv root ${root} ro; - echo Using: [root=${root}] ...; - else - echo Warning: [mmcroot|root] is not set in /boot/uEnv.txt...; - setenv root /dev/mmcblk0p1 ro; - echo Using: [root=${root}] ...; - fi; + echo Warning: [mmcroot] is not set in /boot/uEnv.txt...; + setenv root /dev/mmcblk0p1 ro; + echo Using: [root=/dev/mmcblk0p1 ro] ...; fi; fi; @@ -40,7 +35,7 @@ for i in 1 2 3 4 5 6 7 ; do else echo Warning: [rootfstype] is not set in /boot/uEnv.txt...; setenv rootfstype ext4; - echo Using: [rootfstype=${rootfstype}] ...; + echo Using: [rootfstype=ext4] ...; fi; if test -n ${uname_r}; then