X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_hosted;h=7d5e44451900a2c34c4ef8337011caa4062429b9;hb=e61ce31922a217eafcaa2a2d05d906f9032133e9;hp=4bfbede44076542ac2409aacea22e7eba82d34b0;hpb=9447dd1f7837e04e0ec922df4b47174b38801874;p=lhc%2Fateliers.git

diff --git a/vm_hosted b/vm_hosted
index 4bfbede..7d5e444 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -62,7 +62,7 @@ rule_adduser () {
 	sudo adduser "$@" "$user"
  }
 rule_apt_get_install () { # SYNTAX: $package
-	sudo DEBIAN_FRONTEND=noninteractive apt-get install "$@"
+	sudo DEBIAN_FRONTEND=noninteractive apt-get install --yes "$@"
  }
 rule_dpkg_reconfigure () { # SYNTAX: $package
 	sudo DEBIAN_FRONTEND=noninteractive dpkg-reconfigure "$@"
@@ -259,6 +259,9 @@ rule_apt_configure () {
 		Pin: release a=$vm_lsb_name-backports
 		Pin-Priority: 200
 		EOF
+	#sudo install -m 660 -o root -g root /dev/stdin /etc/apt/apt.conf.d/02proxy-grenode <<-EOF
+	#	Acquire::http::Proxy "http://outils.grenode.net:3142";
+	#	EOF
 	sudo apt-get update
 	rule apt_get_install apticron
 	sudo install -m 644 -o root -g root /dev/stdin /etc/apticron/apticron.conf <<-EOF
@@ -276,9 +279,6 @@ rule_apt_configure () {
 		# CUSTOM_NO_UPDATES_SUBJECT=""
 		# CUSTOM_FROM="root@$vm_fqdn"
 		EOF
-	sudo install -m 660 -o root -g root /dev/stdin /etc/apt/apt.conf.d/01proxy-grenode <<-EOF
-		Acquire::http::Proxy "http://outils.grenode.net:3142";
-		EOF
  }
 rule_boot_configure () {
 	#warn "lors de l'installation Debian, surtout n'installer GRUB sur AUCUN disque proposé !"