import parted
+from image_creator.rsync import Rsync
from image_creator.util import get_command
from image_creator.util import FatalError
if not os.path.isfile(f):
raise FatalError("Unable to open: `%s'. File is missing." % f)
- FileSystemEntry = namedtuple('FileSystemEntry',
+ FileSystemTableEntry = namedtuple('FileSystemTableEntry',
'dev mpoint fs opts freq passno')
with open(f) as table:
for line in iter(table):
entry = line.split('#')[0].strip().split()
if len(entry) != 6:
continue
- yield FileSystemEntry(*entry)
+ yield FileSystemTableEntry(*entry)
def _get_root_partition(self):
for entry in self._read_fstable('/etc/fstab'):
mount_options = self._get_mount_options(
self.disk.getPartitionBySector(last.start).path)
- if mount_options is not None:
+ if mount_options is not None:
stat = os.statvfs(mount_options.mpoint)
# Shrink the last partition. The new size should be the size of the
# occupied blocks
# Leave 2048 blocks at the end.
new_end = new_size + 2048
-
if last.type == parted.PARTITION_LOGICAL:
# Fix the extended partition
extended = disk.getExtendedPartition()
for entry in self._read_fstable('/proc/mounts'):
if entry.mpoint.startswith(os.path.abspath(target)):
mpoints.append(entry.mpoint)
-
+
mpoints.sort()
for mpoint in reversed(mpoints):
umount(mpoint)
+ def _to_exclude(self):
+ excluded = ['/tmp']
+ local_filesystems = MKFS_OPTS.keys() + ['rootfs']
+ for entry in self._read_fstable('/proc/mounts'):
+ if entry.fs in local_filesystems:
+ continue
+
+ mpoint = entry.mpoint
+ if mpoint in excluded:
+ continue
+
+ descendants = filter(lambda p: p.startswith(mpoint + '/'),
+ excluded)
+ if len(descendants):
+ for d in descendants:
+ excluded.remove(d)
+ excluded.append(mpoint)
+ continue
+
+ dirname = mpoint
+ basename = ''
+ found_ancestor = False
+ while dirname != '/':
+ (dirname, basename) = os.path.split(dirname)
+ if dirname in excluded:
+ found_ancestor = True
+ break
+
+ if not found_ancestor:
+ excluded.append(mpoint)
+
+ return map(lambda d: d + "/*", excluded)
+
def _create_filesystems(self, image):
-
+
partitions = self._get_partitions(parted.Disk(parted.Device(image)))
filesystems = {}
for p in self.disk.partitions:
mapped = {}
try:
for p in mounted:
- i = p.num
+ i = p.num
mapped[i] = self._map_partition(loop, i, p.start, p.end)
# Create the file systems
absmpoints = self._mount(target,
[(mapped[i], filesystems[i].mpoint) for i in mapped.keys()]
)
+ exclude = self._to_exclude() + [image]
+ rsync = Rsync('/', target, exclude)
+ msg = "Copying host files into the image"
+ rsync.archive().run(self.out, msg)
finally:
self._umount_all(target)