Revision de7269cd
b/snf-image-helper/common.sh | ||
---|---|---|
159 | 159 |
fi |
160 | 160 |
} |
161 | 161 |
|
162 |
trap cleanup EXIT |
|
163 | 162 |
|
164 | 163 |
check_if_excluded() { |
165 | 164 |
|
... | ... | |
174 | 173 |
return 0 |
175 | 174 |
} |
176 | 175 |
|
176 |
trap cleanup EXIT |
|
177 |
|
|
177 | 178 |
# Check if the execution of a task should be ommited |
178 | 179 |
check_if_excluded |
179 | 180 |
|
b/snf-image-helper/tasks/30MountImage.in | ||
---|---|---|
17 | 17 |
log_error "Device file:\`$SNF_IMAGE_ROOTDEV' is not a block device" |
18 | 18 |
fi |
19 | 19 |
|
20 |
mount "$SNF_IMAGE_ROOTDEV" "$SNF_IMAGE_TARGET" |
|
20 |
mount "$SNF_IMAGE_ROOTDEV" "$SNF_IMAGE_TARGET" -o rw
|
|
21 | 21 |
|
22 | 22 |
exit 0 |
23 | 23 |
|
b/snf-image-helper/tasks/40DeleteSSHKeys.in | ||
---|---|---|
14 | 14 |
log_error "Target dir: \`$SNF_IMAGE_TARGET' is missing." |
15 | 15 |
fi |
16 | 16 |
|
17 |
target="$SNF_IMAGE_TARGET" |
|
18 |
|
|
19 | 17 |
if [ "$SNF_IMAGE_PROPERTY_OSFAMILY" != "linux" ]; then |
20 |
cleanup |
|
21 |
trap - EXIT |
|
22 | 18 |
exit 0 |
23 | 19 |
fi |
24 | 20 |
|
... | ... | |
29 | 25 |
DSA_KEY="/etc/ssh/ssh_host_dsa_key" |
30 | 26 |
ECDSA_KEY="/etc/ssh/ssh_host_ecdsa_key" |
31 | 27 |
|
28 |
target="$SNF_IMAGE_TARGET" |
|
32 | 29 |
|
33 | 30 |
#Remove the default keys |
34 | 31 |
for pair in "$HOST_KEY@rsa1" "$RSA_KEY@rsa" "$DSA_KEY@dsa" "$ECDSA_KEY@ecdsa"; do |
... | ... | |
48 | 45 |
if [ ! -e "$config" ]; then |
49 | 46 |
echo "Warning: Config file: \`$config' is missing." |
50 | 47 |
echo "Warning: Can't check for non-default keys." |
51 |
cleanup |
|
52 |
trap - EXIT |
|
53 | 48 |
exit 0 |
54 | 49 |
fi |
55 | 50 |
|
... | ... | |
93 | 88 |
fi |
94 | 89 |
done |
95 | 90 |
|
96 |
cleanup |
|
97 |
trap - EXIT |
|
98 |
|
|
99 | 91 |
exit 0 |
100 | 92 |
|
101 | 93 |
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai : |
b/snf-image-helper/tasks/40FilesystemResizeMounted.in | ||
---|---|---|
14 | 14 |
log_error "Target directory \`$SNF_IMAGE_TARGET' is missing" |
15 | 15 |
fi |
16 | 16 |
|
17 |
if [ "$SNF_IMAGE_PROPERTY_OSFAMILY" != "windows" ]; then |
|
18 |
exit 0 |
|
19 |
fi |
|
20 |
|
|
17 | 21 |
last_partition=$(get_last_partition "$SNF_IMAGE_DEV") |
18 | 22 |
id=$(echo "$last_partition" | cut -d: -f1) |
19 | 23 |
ptype=$(echo "$last_partition" | cut -d: -f5) |
... | ... | |
30 | 34 |
EOF |
31 | 35 |
fi |
32 | 36 |
|
33 |
cleanup |
|
34 |
trap - EXIT |
|
35 |
|
|
36 | 37 |
exit 0 |
37 | 38 |
|
38 | 39 |
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai : |
b/snf-image-helper/tasks/50AssignHostname.in | ||
---|---|---|
68 | 68 |
linux_hostname "$SNF_IMAGE_TARGET" "$SNF_IMAGE_HOSTNAME" |
69 | 69 |
fi |
70 | 70 |
|
71 |
cleanup |
|
72 |
trap - EXIT |
|
73 |
|
|
74 | 71 |
exit 0 |
75 | 72 |
|
76 | 73 |
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai : |
b/snf-image-helper/tasks/50ChangePassword.in | ||
---|---|---|
82 | 82 |
|
83 | 83 |
echo "done" |
84 | 84 |
|
85 |
cleanup |
|
86 |
trap - EXIT |
|
87 |
|
|
88 | 85 |
exit 0 |
89 | 86 |
|
90 | 87 |
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai : |
b/snf-image-helper/tasks/80UmountImage.in | ||
---|---|---|
16 | 16 |
|
17 | 17 |
umount "$SNF_IMAGE_TARGET" |
18 | 18 |
|
19 |
cleanup |
|
20 |
trap - EXIT |
|
21 |
|
|
22 | 19 |
exit 0 |
23 | 20 |
|
24 | 21 |
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai : |
Also available in: Unified diff