Kaynağa Gözat

Mount point

Bob Mottram 10 yıl önce
ebeveyn
işleme
d4ffd0d9b5
2 değiştirilmiş dosya ile 12 ekleme ve 10 silme
  1. 4
    0
      src/freedombone
  2. 8
    10
      src/freedombone-prep

+ 4
- 0
src/freedombone Dosyayı Görüntüle

@@ -1099,6 +1099,10 @@ function read_configuration {
1099 1099
   fi
1100 1100
 
1101 1101
   if [ -f $CONFIGURATION_FILE ]; then
1102
+      if grep -q "DEBIAN_REPO" $CONFIGURATION_FILE; then
1103
+          DEBIAN_REPO=$(grep "DEBIAN_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1104
+		  CHECK_MESSAGE="Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list."
1105
+      fi
1102 1106
       if grep -q "VOIP_PORT" $CONFIGURATION_FILE; then
1103 1107
           VOIP_PORT=$(grep "VOIP_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1104 1108
       fi

+ 8
- 10
src/freedombone-prep Dosyayı Görüntüle

@@ -63,16 +63,14 @@ fi
63 63
 
64 64
 if [ ! -d $MICROSD_MOUNT_POINT ]; then
65 65
     if [ -d /media ]; then
66
-        if [ ! -d /media/$ROOTFS ]; then
67
-            # different directories for Debian
68
-            if [ -d /media/usb1/home ]; then
69
-                MICROSD_MOUNT_POINT=/media
70
-                ROOTFS=usb1
71
-            fi
72
-            if [ -f /media/usb0/bbb-uEnv.txt ]; then
73
-                MICROSD_MOUNT_POINT=/media
74
-                BOOT=usb0
75
-            fi
66
+        # different directories for Debian
67
+        if [ -d /media/usb1 ]; then
68
+            MICROSD_MOUNT_POINT=/media
69
+            ROOTFS=usb1
70
+        fi
71
+        if [ -d /media/usb0 ]; then
72
+            MICROSD_MOUNT_POINT=/media
73
+            BOOT=usb0
76 74
         fi
77 75
     fi
78 76
     if [ ! -d $MICROSD_MOUNT_POINT ]; then