VA
/
virtual-appliance
1
0
Fork 0
Code Issues Pull Requests Releases 6 Wiki Activity

Move umounting in it's own target and don't ||true it

This commit is contained in:
Albert Hopkins 2010-11-05 08:06:13 -04:00
parent 7a21aed5fe
commit a5af02ae14
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -43,7 +43,7 @@ partitions: $(RAW_IMAGE)
qemu-nbd -c $(NBD_DEV) $(RAW_IMAGE) qemu-nbd -c $(NBD_DEV) $(RAW_IMAGE)
sleep 3 sleep 3
mkfs.ext4 -L "$(APPLIANCE)" $(NBD_DEV)p1 mkfs.ext4 -O sparse_super -L "$(APPLIANCE)" $(NBD_DEV)p1
touch partitions touch partitions
$(CHROOT): $(CHROOT):
@ -194,15 +194,13 @@ $(VMDK_IMAGE): $(RAW_IMAGE) image
vmdk: $(VMDK_IMAGE) vmdk: $(VMDK_IMAGE)
.PHONY: qcow vmdk clean umount:
umount -l $(CHROOT)/usr/portage/packages
umount -l $(CHROOT)/var/tmp
umount -l $(CHROOT)/dev
umount -l $(CHROOT)/proc
clean: clean: umount
for mntpt in \
$(CHROOT)/usr/portage/packages \
$(CHROOT)/var/tmp \
$(CHROOT)/dev \
$(CHROOT)/proc; do \
umount $$mntpt || true; done;
rm -f mounts compile_options base_system portage rm -f mounts compile_options base_system portage
rm -f parted grub stage3 software preproot sysconfig systools image partitions device-map rm -f parted grub stage3 software preproot sysconfig systools image partitions device-map
rm -rf loop rm -rf loop
@ -211,3 +209,5 @@ clean:
realclean: clean realclean: clean
rm -f $(RAW_IMAGE) $(QCOW_IMAGE) $(VMDK_IMAGE) rm -f $(RAW_IMAGE) $(QCOW_IMAGE) $(VMDK_IMAGE)
.PHONY: qcow vmdk clean umount