Bladeren bron

Ordering of repo sources

Bob Mottram 9 jaren geleden
bovenliggende
commit
426c259452
Geen account gekoppeld aan de committers e-mail
1 gewijzigde bestanden met toevoegingen van 8 en 10 verwijderingen
  1. 8
    10
      src/freedombone-image-customise

+ 8
- 10
src/freedombone-image-customise Bestand weergeven

690
         return
690
         return
691
     fi
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
     # desktop
693
     # desktop
701
     chroot "$rootdir" apt-get -y install mate-desktop-environment
694
     chroot "$rootdir" apt-get -y install mate-desktop-environment
702
 
695
 
834
         ;;
827
         ;;
835
 esac
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
 set_apt_sources $BUILD_MIRROR
837
 set_apt_sources $BUILD_MIRROR
838
 chroot "$rootdir" apt-get clean
838
 chroot "$rootdir" apt-get clean
839
 chroot "$rootdir" rm -rf /var/lib/apt/lists/*
839
 chroot "$rootdir" rm -rf /var/lib/apt/lists/*
840
 chroot "$rootdir" apt-get clean
840
 chroot "$rootdir" apt-get clean
841
+set_apt_sources $MIRROR
841
 configure_backports
842
 configure_backports
842
 configure_contrib_repo
843
 configure_contrib_repo
843
 chroot "$rootdir" apt-get update
844
 chroot "$rootdir" apt-get update
914
     disable_eatmydata_override
915
     disable_eatmydata_override
915
 fi
916
 fi
916
 
917
 
917
-set_apt_sources $MIRROR
918
-chroot "$rootdir" apt-get update
919
-
920
 configure_ssh
918
 configure_ssh
921
 configure_networking
919
 configure_networking
922
 admin_user_sudo
920
 admin_user_sudo