From fdc9e45252611914f1f51d1ad009f49a3962a308 2018-12-12 03:07:50 From: Unknown Date: 2018-12-12 03:07:50 Subject: [PATCH] a --- diff --git a/files/apt/sources.list b/files/apt/sources.list index 4a600dd..ffc2c9b 100644 --- a/files/apt/sources.list +++ b/files/apt/sources.list @@ -1,8 +1,8 @@ -# Debian packages for testing -deb http://mirror.united-gameserver.de/debian/ testing main contrib non-free -# Uncomment the deb-src line if you want 'apt-get source' -# to work with most packages. -deb-src http://mirror.united-gameserver.de/debian/ testing main contrib non-free +deb http://ftp.debian.org/debian jessie main contrib +#deb-src http://ftp.debian.org/debian jessie main contrib -# Security updates for stable -# deb http://security.debian.org/ stable/updates main contrib non-free +deb http://ftp.debian.org/debian/ jessie-updates main contrib +#deb-src http://ftp.debian.org/debian/ jessie-updates main contrib + +deb http://security.debian.org/ jessie/updates main contrib +#deb-src http://security.debian.org/ jessie/updates main contrib diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh index 659b4f5..7f05042 100755 --- a/rpi23-gen-image.sh +++ b/rpi23-gen-image.sh @@ -240,24 +240,24 @@ if [ "${APT_CACHER_RUNNING}" = "apt-cacher-ng" ] ; then fi # netselect-apt does not know buster yet -if [ "$RELEASE" = "buster" ] ; then - RLS=testing -else - RLS="$RELEASE" -fi - -if [ -f "$(pwd)/files/apt/sources.list" ] ; then -rm "$(pwd)/files/apt/sources.list" -fi - -if [ "$ENABLE_NONFREE" = true ] ; then - netselect-apt --arch "$RELEASE_ARCH" -t 3 --sources --nonfree --outfile "$(pwd)/files/apt/sources.list" -d "$RLS" -else - netselect-apt --arch "$RELEASE_ARCH" -t 3 --sources --outfile "$(pwd)/files/apt/sources.list" -d "$RLS" -fi +#if [ "$RELEASE" = "buster" ] ; then +# RLS=testing +#else +# RLS="$RELEASE" +#fi + +#if [ -f "$(pwd)/files/apt/sources.list" ] ; then +#rm "$(pwd)/files/apt/sources.list" +#fi + +#if [ "$ENABLE_NONFREE" = true ] ; then +# netselect-apt --arch "$RELEASE_ARCH" -t 3 --sources --nonfree --outfile "$(pwd)/files/apt/sources.list" -d "$RLS" +#else +# netselect-apt --arch "$RELEASE_ARCH" -t 3 --sources --outfile "$(pwd)/files/apt/sources.list" -d "$RLS" +#fi # sed and cut the result string so we can use it as APT_SERVER -APT_SERVER=$(grep -m 1 http files/apt/sources.list | sed "s|http://| |g" | cut -d ' ' -f 3 | sed 's|/$|''|') +#APT_SERVER=$(grep -m 1 http files/apt/sources.list | sed "s|http://| |g" | cut -d ' ' -f 3 | sed 's|/$|''|') # make script easier and more stable to use with convenient setup switch. Just setup SET_ARCH and RPI_MODEL and your good to go! if [ -n "$SET_ARCH" ] ; then