← Back to branch summary

~j-harbott/cirros/dev

« back to all changes in this revision

Viewing changes to bin/bundle

  • Committer: Scott Moser
  • Date: 2011-10-26 16:56:46 UTC
  • Revision ID: smoser@ubuntu.com-20111026165646-xjqp0xk0411ab5x6
move fixup-fs to run before kernel and boot are laid down

Since this is when we collect the lxc filesystem, we need fixup to run before
then.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/bundle
207
207
tar -C "$stage_d" -xpf - < "$overlay_tar" ||
208
208
        fail "failed to extract overlay_tar"
209
209
 
 
210
if [ -x "${fixup_fs}" ]; then
 
211
        "${fixup_fs}" "${stage_d}" ||
 
212
                fail "failed to fixup filesystem"
 
213
fi
 
214
 
210
215
( cd "$stage_d" && tar -Scpzf - -- * ) > "$out_filesys_lxc" ||
211
216
        fail "failed to create filesys tarball"
212
217
 
218
223
depmod -a --basedir "$stage_d" "${kver}" ||
219
224
        fail "failed to run depmod for kver ${kver} in output"
220
225
 
221
 
if [ -x "${fixup_fs}" ]; then
222
 
        "${fixup_fs}" "${stage_d}" ||
223
 
                fail "failed to fixup filesystem"
224
 
fi
225
 
 
226
226
debug 1 "creating initramfs"
227
227
xrsync "$stage_d/" "$initramfs_d" ||
228
228
        fail "failed to copy to initramfs_d"