Browse Source

Since repos are included in the image, deprecate mirrors

Bob Mottram 8 years ago
parent
commit
e5db89ecb6

+ 3
- 1
src/freedombone-config View File

862
 done
862
 done
863
 
863
 
864
 function set_main_repo {
864
 function set_main_repo {
865
+    return
866
+
865
     data=$(tempfile 2>/dev/null)
867
     data=$(tempfile 2>/dev/null)
866
     trap "rm -f $data" 0 1 2 5 15
868
     trap "rm -f $data" 0 1 2 5 15
867
     dialog --backtitle $"Freedombone Control Panel" \
869
     dialog --backtitle $"Freedombone Control Panel" \
1123
     dialog --title $"Freedombone" --msgbox "$INITIAL_MESSAGE" 15 50
1125
     dialog --title $"Freedombone" --msgbox "$INITIAL_MESSAGE" 15 50
1124
 
1126
 
1125
     #choose_system_variant
1127
     #choose_system_variant
1126
-    set_main_repo
1128
+    #set_main_repo
1127
     choose_username
1129
     choose_username
1128
     choose_full_name
1130
     choose_full_name
1129
     choose_social_key_management
1131
     choose_social_key_management

+ 20
- 18
src/freedombone-controlpanel View File

268
 }
268
 }
269
 
269
 
270
 function set_main_repo {
270
 function set_main_repo {
271
+    return
272
+
271
     data=$(tempfile 2>/dev/null)
273
     data=$(tempfile 2>/dev/null)
272
     trap "rm -f $data" 0 1 2 5 15
274
     trap "rm -f $data" 0 1 2 5 15
273
     dialog --backtitle $"Freedombone Control Panel" \
275
     dialog --backtitle $"Freedombone Control Panel" \
492
 }
494
 }
493
 
495
 
494
 function show_mirrors_password {
496
 function show_mirrors_password {
497
+    return
498
+
495
     if [ ! /home/mirrors ]; then
499
     if [ ! /home/mirrors ]; then
496
         return
500
         return
497
     fi
501
     fi
592
     show_ssh_public_key
596
     show_ssh_public_key
593
     show_domains
597
     show_domains
594
     show_tahoelafs
598
     show_tahoelafs
595
-    show_mirrors_password
599
+    #show_mirrors_password
596
     show_users
600
     show_users
597
     any_key
601
     any_key
598
 }
602
 }
2102
         trap "rm -f $data" 0 1 2 5 15
2106
         trap "rm -f $data" 0 1 2 5 15
2103
         dialog --backtitle $"Freedombone Control Panel" \
2107
         dialog --backtitle $"Freedombone Control Panel" \
2104
                --title $"Control Panel" \
2108
                --title $"Control Panel" \
2105
-               --radiolist $"Choose an operation:" 29 70 21 \
2109
+               --radiolist $"Choose an operation:" 28 70 20 \
2106
                1 $"About this system" off \
2110
                1 $"About this system" off \
2107
                2 $"Passwords" off \
2111
                2 $"Passwords" off \
2108
                3 $"Backup and Restore" off \
2112
                3 $"Backup and Restore" off \
2116
                11 $"Email Menu" off \
2120
                11 $"Email Menu" off \
2117
                12 $"Domain or User Blocking" off \
2121
                12 $"Domain or User Blocking" off \
2118
                13 $"Security Settings" off \
2122
                13 $"Security Settings" off \
2119
-               14 $"Set the main repository (repo mirrors)" off \
2120
-               15 $"Change the name of this system" off \
2121
-               16 $"Set a static local IP address" off \
2122
-               17 $"Wifi menu" off \
2123
-               18 $"Check for updates" off \
2124
-               19 $"Power off the system" off \
2125
-               20 $"Restart the system" off \
2126
-               21 $"Exit" on 2> $data
2123
+               14 $"Change the name of this system" off \
2124
+               15 $"Set a static local IP address" off \
2125
+               16 $"Wifi menu" off \
2126
+               17 $"Check for updates" off \
2127
+               18 $"Power off the system" off \
2128
+               19 $"Restart the system" off \
2129
+               20 $"Exit" on 2> $data
2127
         sel=$?
2130
         sel=$?
2128
         case $sel in
2131
         case $sel in
2129
             1) exit 1;;
2132
             1) exit 1;;
2148
             11) menu_email;;
2151
             11) menu_email;;
2149
             12) domain_blocking;;
2152
             12) domain_blocking;;
2150
             13) security_settings;;
2153
             13) security_settings;;
2151
-            14) set_main_repo;;
2152
-            15) change_system_name;;
2153
-            16) set_static_IP;;
2154
-            17) menu_wifi;;
2155
-            18) check_for_updates;;
2156
-            19) shut_down_system;;
2157
-            20) restart_system;;
2158
-            21) break;;
2154
+            14) change_system_name;;
2155
+            15) set_static_IP;;
2156
+            16) menu_wifi;;
2157
+            17) check_for_updates;;
2158
+            18) shut_down_system;;
2159
+            19) restart_system;;
2160
+            20) break;;
2159
         esac
2161
         esac
2160
     done
2162
     done
2161
 }
2163
 }

+ 1
- 1
src/freedombone-upgrade View File

72
 update-ca-certificates
72
 update-ca-certificates
73
 
73
 
74
 read_repo_servers
74
 read_repo_servers
75
-${PROJECT_NAME}-mirrors
75
+#${PROJECT_NAME}-mirrors
76
 
76
 
77
 if [ ! -d $PROJECT_DIR ]; then
77
 if [ ! -d $PROJECT_DIR ]; then
78
     git_clone $PROJECT_REPO $PROJECT_DIR
78
     git_clone $PROJECT_REPO $PROJECT_DIR

+ 1
- 1
src/freedombone-utils-repos View File

143
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
143
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
144
         return
144
         return
145
     fi
145
     fi
146
-    ${PROJECT_NAME}-mirrors
146
+    #${PROJECT_NAME}-mirrors
147
     mark_completed $FUNCNAME
147
     mark_completed $FUNCNAME
148
 }
148
 }
149
 
149
 

+ 2
- 2
src/freedombone-utils-selector View File

572
                             function_check add_users_after_install
572
                             function_check add_users_after_install
573
                             add_users_after_install ${a}
573
                             add_users_after_install ${a}
574
 
574
 
575
-                            ${PROJECT_NAME}-mirrors --app ${a}
575
+                            #${PROJECT_NAME}-mirrors --app ${a}
576
 
576
 
577
                             function_check lockdown_permissions
577
                             function_check lockdown_permissions
578
                             lockdown_permissions
578
                             lockdown_permissions
609
                                 function_check lockdown_permissions
609
                                 function_check lockdown_permissions
610
                                 lockdown_permissions
610
                                 lockdown_permissions
611
 
611
 
612
-                                ${PROJECT_NAME}-mirrors --app ${a}
612
+                                #${PROJECT_NAME}-mirrors --app ${a}
613
 
613
 
614
                                 function_check install_completed
614
                                 function_check install_completed
615
                                 install_completed ${a}
615
                                 install_completed ${a}