From 902f819ba6a71cb0ddc78c31a66258df876fd053 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+burette@autogeree.net>
Date: Wed, 20 Feb 2013 00:59:51 +0100
Subject: [PATCH] Ajout : vm_hosted : rule_apt_get_install .

---
 vm_hosted | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/vm_hosted b/vm_hosted
index 81dec85..7934de6 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -37,6 +37,16 @@ rule_git_reset () {
 	)
  }
 
+rule_apt_get_install () { # SYNTAX: $package
+	case $(dpkg -s "$1" | grep '^Status: ') in
+		("Status: install ok installed");;
+		(*)
+		test ! -x /usr/bin/etckeeper ||
+		assert 'sudo etckeeper unclean'
+		sudo apt-get "$@";;
+	 esac
+ }
+
 rule__chrooted_configure () { # NOTE: est-ce bien utile à un moment ?
 	export LANG=C
 	export LC_CTYPE=C
@@ -64,7 +74,7 @@ rule_apt_configure () {
 		EOF
  }
 rule_apticron_configure () {
-	sudo apt-get install --reinstall apticron
+	rule apt_get_install apticron
 	mk_reg mod=644 own=root:root /etc/apticron/apticron.conf <<-EOF
 		EMAIL="admin@heureux-cyclage.org"
 		# DIFF_ONLY="1"
@@ -83,9 +93,9 @@ rule_apticron_configure () {
 	sudo service apticron restart
  }
 rule_boot_configure () {
-	sudo apt-get install --reinstall grub-pc # XXX: attention à n'installer GRUB sur AUCUN disque proposé !
+	rule apt_get_install grub-pc # XXX: attention à n'installer GRUB sur AUCUN disque proposé !
 	mk_dir mod=644 own=root:root /boot/grub
-	sudo apt-get install --reinstall linux-image-$vm_arch
+	rule apt_get_install linux-image-$vm_arch
 	mk_reg mod=644 own=root:root /etc/default/grub <<-EOF
 		GRUB_DEFAULT=0
 		GRUB_TIMEOUT=5
@@ -112,6 +122,7 @@ rule_etckeeper_configure () {
 		HIGHLEVEL_PACKAGE_MANAGER=apt
 		LOWLEVEL_PACKAGE_MANAGER=dpkg
 		EOF
+	rule apt_get_install etckeeper
  }
 rule_filesystem_configure () {
 	mk_reg mod=644 own=root:root /etc/fstab <<-EOF
-- 
2.20.1