From 41a0d3226c86a3c719658f23b02aeb106d09fc3c Mon Sep 17 00:00:00 2001 From: Diego Pasqualin <dpasqualin@c3sl.ufpr.br> Date: Fri, 27 Sep 2013 16:52:57 -0300 Subject: [PATCH] Revert "Do not use quantal repository for minicom project" This reverts commit cc21c3d93579ce187ee3a7a6d8ac32e346b07436. --- scripts/00-update | 4 +--- scripts/35-upgrade-gnome | 8 +++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/00-update b/scripts/00-update index 5a1769b..dbf4a41 100755 --- a/scripts/00-update +++ b/scripts/00-update @@ -62,8 +62,7 @@ echo "deb http://$LEHOST $LEMIRROR main" \ echo "deb http://archive.canonical.com/ lucid partner" \ >> "$CHROOTDIR"/etc/apt/sources.list.d/java-repos.list -if [[ "$1" != minicom/* ]]; then - echo "deb http://br.archive.ubuntu.com/ubuntu/ quantal main restricted +echo "deb http://br.archive.ubuntu.com/ubuntu/ quantal main restricted deb-src http://br.archive.ubuntu.com/ubuntu/ quantal main restricted deb http://br.archive.ubuntu.com/ubuntu/ quantal-updates main restricted deb-src http://br.archive.ubuntu.com/ubuntu/ quantal-updates main restricted @@ -72,7 +71,6 @@ deb-src http://br.archive.ubuntu.com/ubuntu/ quantal universe deb http://br.archive.ubuntu.com/ubuntu/ quantal-updates universe deb-src http://br.archive.ubuntu.com/ubuntu/ quantal-updates universe" >> "$CHROOTDIR"/etc/apt/sources.list.d/quantal-repos.list -fi chroot "$CHROOTDIR" wget http://windu.c3sl.ufpr.br/le/public.key -O /dev/stdout \ > "$TMP"/windu.key diff --git a/scripts/35-upgrade-gnome b/scripts/35-upgrade-gnome index 07a4979..06dade7 100755 --- a/scripts/35-upgrade-gnome +++ b/scripts/35-upgrade-gnome @@ -31,11 +31,9 @@ loadConf "$PREFIX/conf/$1/create-iso.conf" $1 initChroot # Changes distro -if [[ "$1" != minicom/* ]]; then - chroot "$CHROOTDIR" apt-get update - chroot "$CHROOTDIR" apt-get -y --force-yes -t quantal install \ - gnome-session libcogl9 gnome-session-fallback -fi +chroot "$CHROOTDIR" apt-get update +chroot "$CHROOTDIR" apt-get -y --force-yes -t quantal install \ + gnome-session libcogl9 gnome-session-fallback # Manually installing casper after all other packages should fix some initctl failures according to # https://bugs.launchpad.net/ubuntu/+source/casper/+bug/984276 -- GitLab