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

Makefile: make changing of root password and removing or portage tree both optional

This commit is contained in:
Albert Hopkins 2010-12-19 23:04:11 -05:00
parent f9ef73eb07
commit 76be9a9aa0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -13,6 +13,8 @@ SWAP_FILE = $(CHROOT)/.swap
ARCH = amd64 ARCH = amd64
MAKEOPTS = -j4 MAKEOPTS = -j4
PRUNE_CRITICAL = NO PRUNE_CRITICAL = NO
REMOVE_PORTAGE_TREE = YES
CHANGE_PASSWORD = YES
HEADLESS = NO HEADLESS = NO
ACCEPT_KEYWORDS = amd64 ACCEPT_KEYWORDS = amd64
@ -45,6 +47,14 @@ else
COPY_LOOP = rsync -ax --exclude-from=rsync-excludes gentoo/ loop/ COPY_LOOP = rsync -ax --exclude-from=rsync-excludes gentoo/ loop/
endif endif
ifeq ($(CHANGE_PASSWORD),YES)
change_password = chroot $(CHROOT) passwd -d root; chroot $(CHROOT) passwd -e root
endif
ifeq ($(REMOVE_PORTAGE_TREE),YES)
COPY_LOOP += --exclude=usr/portage
endif
ifeq ($(VIRTIO),YES) ifeq ($(VIRTIO),YES)
VIRTIO_FSTAB = sed -i 's/sda/vda/' $(CHROOT)/etc/fstab VIRTIO_FSTAB = sed -i 's/sda/vda/' $(CHROOT)/etc/fstab
VIRTIO_GRUB = sed -i 's/sda/vda/' $(CHROOT)/boot/grub/grub.conf VIRTIO_GRUB = sed -i 's/sda/vda/' $(CHROOT)/boot/grub/grub.conf
@ -193,8 +203,7 @@ software: systools issue etc-update.conf $(CRITICAL) $(WORLD)
$(gcc_config) $(gcc_config)
chroot $(CHROOT) etc-update chroot $(CHROOT) etc-update
$(MAKE) -C $(APPLIANCE) postinstall $(MAKE) -C $(APPLIANCE) postinstall
chroot $(CHROOT) passwd -d root $(change_password)
chroot $(CHROOT) passwd -e root
$(UNMERGE_CRITICAL) $(UNMERGE_CRITICAL)
touch software touch software