Changes for new /boot directory structure

Author: spl237

raspi-config

@@ -6,7 +6,13 @@
 INTERACTIVE=True
 ASK_TO_REBOOT=0
 BLACKLIST=/etc/modprobe.d/raspi-blacklist.conf
-CONFIG=/boot/config.txt
+
+if [ -e /boot/firmware/config.txt ] ; then
+  FIRMWARE=/firmware
+else
+  FIRMWARE=
+fi
+CONFIG=/boot${FIRMWARE}/config.txt
 
 USER=${SUDO_USER:-$(who -m | awk '{ print $1 }')}
 INIT="$(ps --no-headers -o comm 1)"
@@ -24,7 +30,7 @@ if is_pi ; then
   if [ -e /proc/device-tree/chosen/os_prefix ]; then
     PREFIX="$(cat /proc/device-tree/chosen/os_prefix)"
   fi
-  CMDLINE="/boot/${PREFIX}cmdline.txt"
+  CMDLINE="/boot${FIRMWARE}/${PREFIX}cmdline.txt"
 else
   CMDLINE=/proc/cmdline
 fi
@@ -148,17 +154,17 @@ can_configure() {
   if ! is_pi; then
     return 0
   fi
-  if [ ! -e /boot/start_x.elf ]; then
+  if [ ! -e /boot${FIRMWARE}/start_x.elf ]; then
     return 1
   fi
   if [ -e $CONFIG ] && grep -q "^device_tree=$" $CONFIG; then
     return 1
   fi
-  if ! mountpoint -q /boot; then
+  if ! mountpoint -q /boot${FIRMWARE}; then
     return 1
   fi
-  if [ ! -e /boot/config.txt ]; then
-	touch /boot/config.txt
+  if [ ! -e $CONFIG ]; then
+	  touch $CONFIG
   fi
   return 0
 }
@@ -821,7 +827,7 @@ No other symbols, punctuation characters, or blank spaces are permitted.\
 }
 
 do_memory_split() { # Memory Split
-  if [ -e /boot/start_cd.elf ]; then
+  if [ -e /boot${FIRMWARE}/start_cd.elf ]; then
     # New-style memory split setting
     ## get current memory split from /boot/config.txt
     arm=$(vcgencmd get_mem arm | cut -d '=' -f 2 | cut -d 'M' -f 1)
@@ -877,7 +883,7 @@ get_current_memory_split() {
   AVAILABLE_SPLITS="128 192 224 240"
   MEMSPLIT_DESCRIPTION=""
   for SPLIT in $AVAILABLE_SPLITS;do
-    if [ -e /boot/arm${SPLIT}_start.elf ] && cmp /boot/arm${SPLIT}_start.elf /boot/start.elf >/dev/null 2>&1;then
+    if [ -e /boot${FIRMWARE}/arm${SPLIT}_start.elf ] && cmp /boot${FIRMWARE}/arm${SPLIT}_start.elf /boot${FIRMWARE}/start.elf >/dev/null 2>&1;then
       CURRENT_MEMSPLIT=$SPLIT
       MEMSPLIT_DESCRIPTION="Current: ${CURRENT_MEMSPLIT}MiB for ARM, $((256 - CURRENT_MEMSPLIT))MiB for VideoCore"
       break
@@ -886,7 +892,7 @@ get_current_memory_split() {
 }
 
 set_memory_split() {
-  cp -a /boot/arm${1}_start.elf /boot/start.elf
+  cp -a /boot${FIRMWARE}/arm${1}_start.elf /boot${FIRMWARE}/start.elf
   sync
 }
 
@@ -1999,7 +2005,7 @@ get_camera() {
 }
 
 do_camera() {
-  if [ $(deb_ver) -le 10 ] && [ ! -e /boot/start_x.elf ]; then
+  if [ $(deb_ver) -le 10 ] && [ ! -e /boot${FIRMWARE}/start_x.elf ]; then
     whiptail --msgbox "Your firmware appears to be out of date (no start_x.elf). Please update" 20 60 2
     return 1
   fi
@@ -2151,7 +2157,7 @@ do_legacy() {
 }
 
 do_gldriver() {
-  if [ ! -e /boot/overlays/vc4-kms-v3d.dtbo ]; then
+  if [ ! -e /boot${FIRMWARE}/overlays/vc4-kms-v3d.dtbo ]; then
     whiptail --msgbox "Driver and kernel not present on your system. Please update" 20 60 2
     return 1
   fi
@@ -2888,12 +2894,12 @@ get_overlay_conf() {
 }
 
 get_bootro_now() {
-  findmnt /boot | grep -q " ro,"
+  findmnt /boot${FIRMWARE} | grep -q " ro,"
   echo $?
 }
 
 get_bootro_conf() {
-  grep /boot /etc/fstab | grep -q "defaults.*,ro[ ,]"
+  grep /boot${FIRMWARE} /etc/fstab | grep -q "defaults.*,ro[ ,]"
   echo $?
 }
 
@@ -2907,7 +2913,7 @@ enable_overlayfs() {
 
   # mount the boot partition as writable if it isn't already
   if [ $(get_bootro_now) -eq 0 ] ; then
-    if ! mount -o remount,rw /boot 2>/dev/null ; then
+    if ! mount -o remount,rw /boot${FIRMWARE} 2>/dev/null ; then
       echo "Unable to mount boot partition as writable - cannot enable"
       return 1
     fi
@@ -2985,16 +2991,16 @@ EOF
   # there is now a modified initramfs ready for use...
 
   # modify config.txt
-  sed -i /boot/config.txt -e "/initramfs.*/d" 
-  echo initramfs "$INITRD" >> /boot/config.txt
+  sed -i $CONFIG -e "/initramfs.*/d"
+  echo initramfs "$INITRD" >> $CONFIG
 
   # modify command line
   if ! grep -q "boot=overlay" $CMDLINE ; then
     sed -i $CMDLINE -e "s/^/boot=overlay /"
   fi
 
   if [ "$BOOTRO" = "yes" ] ; then
-    if ! mount -o remount,ro /boot 2>/dev/null ; then
+    if ! mount -o remount,ro /boot${FIRMWARE} 2>/dev/null ; then
       echo "Unable to remount boot partition as read-only"
     fi
   fi
@@ -3004,7 +3010,7 @@ disable_overlayfs() {
   KERN=$(uname -r)
   # mount the boot partition as writable if it isn't already
   if [ $(get_bootro_now) -eq 0 ] ; then
-    if ! mount -o remount,rw /boot 2>/dev/null ; then
+    if ! mount -o remount,rw /boot${FIRMWARE} 2>/dev/null ; then
       echo "Unable to mount boot partition as writable - cannot disable"
       return 1
     fi
@@ -3014,14 +3020,14 @@ disable_overlayfs() {
   fi
 
   # modify config.txt
-  sed -i /boot/config.txt -e "/initramfs.*/d"
+  sed -i $CONFIG -e "/initramfs.*/d"
   update-initramfs -d -k "${KERN}-overlay"
 
   # modify command line
   sed -i $CMDLINE -e "s/\(.*\)boot=overlay \(.*\)/\1\2/"
 
   if [ "$BOOTRO" = "yes" ] ; then
-    if ! mount -o remount,ro /boot 2>/dev/null ; then
+    if ! mount -o remount,ro /boot${FIRMWARE} 2>/dev/null ; then
       echo "Unable to remount boot partition as read-only"
     fi
   fi
@@ -3032,15 +3038,15 @@ enable_bootro() {
     echo "Overlay in use; cannot update fstab"
     return 1
   fi
-  sed -i /etc/fstab -e "s/\(.*\/boot.*\)defaults\(.*\)/\1defaults,ro\2/"
+  sed -i /etc/fstab -e "s#\(.*/boot$FIRMWARE.*\)defaults\(.*\)#\1defaults,ro\2#"
 }
 
 disable_bootro() {
   if [ $(get_overlay_now) -eq 0 ] ; then
     echo "Overlay in use; cannot update fstab"
     return 1
   fi
-  sed -i /etc/fstab -e "s/\(.*\/boot.*\)defaults,ro\(.*\)/\1defaults\2/"
+  sed -i /etc/fstab -e "s#\(.*/boot$FIRMWARE.*\)defaults,ro\(.*\)#\1defaults\2#"
 }
 
 do_overlayfs() {
@@ -3312,7 +3318,6 @@ do_display_menu() {
   if is_pi ; then
     if is_wayfire; then
       FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Display Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \
-        "D2 Underscan" "Remove black border around screen" \
         "D4 Screen Blanking" "Enable/disable screen blanking" \
         "D5 VNC Resolution" "Set resolution for headless use" \
         "D6 Composite" "Set options for composite output" \