Ordering of repo sources
This commit is contained in:
parent
e07c8eb2a5
commit
426c259452
|
@ -690,13 +690,6 @@ function configure_user_interface {
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! $DEBIAN_REPO ]; then
|
|
||||||
DEBIAN_REPO='ftp.de.debian.org'
|
|
||||||
fi
|
|
||||||
if [ ! $DEBIAN_VERSION ]; then
|
|
||||||
DEBIAN_VERSION='jessie'
|
|
||||||
fi
|
|
||||||
|
|
||||||
# desktop
|
# desktop
|
||||||
chroot "$rootdir" apt-get -y install mate-desktop-environment
|
chroot "$rootdir" apt-get -y install mate-desktop-environment
|
||||||
|
|
||||||
|
@ -834,10 +827,18 @@ case "$MACHINE" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
if [ ! $DEBIAN_REPO ]; then
|
||||||
|
DEBIAN_REPO='ftp.de.debian.org'
|
||||||
|
fi
|
||||||
|
if [ ! $DEBIAN_VERSION ]; then
|
||||||
|
DEBIAN_VERSION='jessie'
|
||||||
|
fi
|
||||||
|
|
||||||
set_apt_sources $BUILD_MIRROR
|
set_apt_sources $BUILD_MIRROR
|
||||||
chroot "$rootdir" apt-get clean
|
chroot "$rootdir" apt-get clean
|
||||||
chroot "$rootdir" rm -rf /var/lib/apt/lists/*
|
chroot "$rootdir" rm -rf /var/lib/apt/lists/*
|
||||||
chroot "$rootdir" apt-get clean
|
chroot "$rootdir" apt-get clean
|
||||||
|
set_apt_sources $MIRROR
|
||||||
configure_backports
|
configure_backports
|
||||||
configure_contrib_repo
|
configure_contrib_repo
|
||||||
chroot "$rootdir" apt-get update
|
chroot "$rootdir" apt-get update
|
||||||
|
@ -914,9 +915,6 @@ if $use_eatmydata ; then
|
||||||
disable_eatmydata_override
|
disable_eatmydata_override
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set_apt_sources $MIRROR
|
|
||||||
chroot "$rootdir" apt-get update
|
|
||||||
|
|
||||||
configure_ssh
|
configure_ssh
|
||||||
configure_networking
|
configure_networking
|
||||||
admin_user_sudo
|
admin_user_sudo
|
||||||
|
|
Loading…
Reference in New Issue