Pārlūkot izejas kodu

Ordering of repo sources

Bob Mottram 9 gadus atpakaļ
vecāks
revīzija
426c259452
Revīzijas autora e-pasts nav piesaistīts nevienam kontam
1 mainītis faili ar 8 papildinājumiem un 10 dzēšanām
  1. 8
    10
      src/freedombone-image-customise

+ 8
- 10
src/freedombone-image-customise Parādīt failu

@@ -690,13 +690,6 @@ function configure_user_interface {
690 690
         return
691 691
     fi
692 692
 
693
-    if [ ! $DEBIAN_REPO ]; then
694
-        DEBIAN_REPO='ftp.de.debian.org'
695
-    fi
696
-    if [ ! $DEBIAN_VERSION ]; then
697
-        DEBIAN_VERSION='jessie'
698
-    fi
699
-
700 693
     # desktop
701 694
     chroot "$rootdir" apt-get -y install mate-desktop-environment
702 695
 
@@ -834,10 +827,18 @@ case "$MACHINE" in
834 827
         ;;
835 828
 esac
836 829
 
830
+if [ ! $DEBIAN_REPO ]; then
831
+    DEBIAN_REPO='ftp.de.debian.org'
832
+fi
833
+if [ ! $DEBIAN_VERSION ]; then
834
+    DEBIAN_VERSION='jessie'
835
+fi
836
+
837 837
 set_apt_sources $BUILD_MIRROR
838 838
 chroot "$rootdir" apt-get clean
839 839
 chroot "$rootdir" rm -rf /var/lib/apt/lists/*
840 840
 chroot "$rootdir" apt-get clean
841
+set_apt_sources $MIRROR
841 842
 configure_backports
842 843
 configure_contrib_repo
843 844
 chroot "$rootdir" apt-get update
@@ -914,9 +915,6 @@ if $use_eatmydata ; then
914 915
     disable_eatmydata_override
915 916
 fi
916 917
 
917
-set_apt_sources $MIRROR
918
-chroot "$rootdir" apt-get update
919
-
920 918
 configure_ssh
921 919
 configure_networking
922 920
 admin_user_sudo