Permalink
Browse files

v140

+ Do not use UUID for Odroid rootfs
  • Loading branch information...
1 parent b6b4c51 commit 6c5cda09bc093545de7bee4ca67adaf7d3b02501 @Fourdee committed Dec 10, 2016
Showing with 11 additions and 4 deletions.
  1. +1 −1 boot_c1.ini
  2. +1 −1 boot_c2.ini
  3. +1 −1 boot_xu4.ini
  4. +8 −1 dietpi/dietpi-drive_manager
View
@@ -49,7 +49,7 @@ if test "${hpd}" = "0"; then setenv hdmi_hpd "disablehpd=true"; fi
if test "${cec}" = "1"; then setenv hdmi_cec "hdmitx=cecf"; fi
# Boot Arguments
-setenv bootargs "root=UUID=e139ce78-9841-40fe-8823-96a304a09859 rootwait ro ${condev} no_console_suspend vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout_mode} ${disableuhs} ${hdmi_hpd} ${hdmi_cec} ${enabledac}"
+setenv bootargs "root=/dev/mmcblk0p2 rootwait ro ${condev} no_console_suspend vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout_mode} ${disableuhs} ${hdmi_hpd} ${hdmi_cec} ${enabledac}"
# Booting
fatload mmc 0:1 0x21000000 uImage
View
@@ -40,7 +40,7 @@ setenv nographics "0"
###########################################
# Boot Arguments
-setenv bootargs "root=UUID=e139ce78-9841-40fe-8823-96a304a09859 rootwait ro ${condev} no_console_suspend hdmimode=${m} m_bpp=${m_bpp} vout=${vout} fsck.repair=yes net.ifnames=0 elevator=noop disablehpd=${hpd}"
+setenv bootargs "root=/dev/mmcblk0p2 rootwait ro ${condev} no_console_suspend hdmimode=${m} m_bpp=${m_bpp} vout=${vout} fsck.repair=yes net.ifnames=0 elevator=noop disablehpd=${hpd}"
# Booting
View
@@ -10,7 +10,7 @@ setenv macaddr "00:1e:06:61:7a:72"
#------------------------------------------------------------------------------------------------------
# Basic Ubuntu Setup. Don't touch unless you know what you are doing.
# --------------------------------
-setenv bootrootfs "console=tty1 root=UUID=e139ce78-9841-40fe-8823-96a304a09859 rootwait ro fsck.repair=yes"
+setenv bootrootfs "console=tty1 root=/dev/mmcblk0p2 rootwait ro fsck.repair=yes"
# boot commands
setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; fatload mmc 0:1 0x44000000 exynos5422-odroidxu3.dtb; bootz 0x40008000 0x42000000 0x44000000"
@@ -1051,7 +1051,14 @@
#C1/C2/XU4 | /DietPi/boot.ini
elif (( $HW_MODEL == 10 || $HW_MODEL == 11 || $HW_MODEL == 12 )); then
- sed -i "s#root=UUID=e139ce78-9841-40fe-8823-96a304a09859#root=UUID=${aDRIVE_UUID[$INDEX_DRIVE_BEING_EDITED]} rootdelay=10#g" /DietPi/boot.ini
+ local string_match='UUID=e139ce78-9841-40fe-8823-96a304a09859'
+ if (( ! $(cat /DietPi/boot.ini | grep -ci -m1 "$string_match") )); then
+
+ string_match='/dev/mmcblk0p2'
+
+ fi
+
+ sed -i "s#root=$string_match#root=UUID=${aDRIVE_UUID[$INDEX_DRIVE_BEING_EDITED]} rootdelay=10#g" /DietPi/boot.ini
fi

0 comments on commit 6c5cda0

Please sign in to comment.