dépôts
/
lhc
/
ateliers.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[rule hosted] +apticron_init
[lhc/ateliers.git]
/
vm_host
diff --git
a/vm_host
b/vm_host
index
f754547
..
fc70bba
100755
(executable)
--- a/
vm_host
+++ b/
vm_host
@@
-1,9
+1,8
@@
#!/bin/sh
set -e -f ${DRY_RUN:+-n} -u
tool=${0%/*}
#!/bin/sh
set -e -f ${DRY_RUN:+-n} -u
tool=${0%/*}
-. "$tool"/functions.sh
-. "$tool"/vm.sh
-test "$(hostname --fqdn)" = "$vm_host"
+. "$tool"/lib/functions.sh
+. "$tool"/etc/vm.sh
rule_help () {
cat >&2 <<-EOF
rule_help () {
cat >&2 <<-EOF
@@
-359,6
+358,7
@@
rule_debian_install () {
dnsutils \
dropbear \
etckeeper \
dnsutils \
dropbear \
etckeeper \
+ git-core \
gnupg \
hashalot \
htop \
gnupg \
hashalot \
htop \
@@
-434,5
+434,11
@@
rule__chroot_clean () {
rule=${1:-help}
${1+shift}
rule=${1:-help}
${1+shift}
-set "${TRACE:+-x}"
+case $rule in
+ (help);;
+ (*)
+ test "$(hostname --fqdn)" = "$vm_host"
+ set "${TRACE:+-x}"
+ ;;
+ esac
rule_$rule "$@"
rule_$rule "$@"