Makefile

@@ -56,10 +56,8 @@ grub:
 	chroot $(MNTDIR) grub-mkconfig -o /boot/grub/grub.cfg
 	chroot $(MNTDIR) grub-install $(BOOTLDR)
 
-metal: mnt-drive mnt-system base set-loc set-resolv set-fstab set-root set-keymap set-term grub
-
-python:
-	$(call vinstall,python3 python3-pip python3-pipenv)
+wifi:
+	$(call vinstall,NetworkManager elogind)
 
 xorg:
 	$(call vinstall,xorg)
@@ -70,19 +68,23 @@ audio:
 	$(call vinstall,apulse)
 	$(call vinstall,alsa-plugins-pulseaudio)
 
-wifi:
-	$(call vinstall,NetworkManager elogind)
+metal: mnt-drive mnt-system base set-loc set-resolv set-fstab set-root grub
+
+python:
+	$(call vinstall,python3 python3-pip python3-pipenv)
 
 tools:
 	$(call vinstall,base-devel git tcc wget vim-x11 tmux psmisc)
 
-post-install: tools
+post-install: python tools
 	cp post-install.sh $(MNTDIR)/usr/local/bin/
-	cp first-boot.sh $(MNTDIR)/usr/local/bin/
 	chmod 755 $(MNTDIR)/usr/local/bin/post-install.sh
 	chroot $(MNTDIR) ln -s /usr/share/zoneinfo/$(TIMEZN) /etc/localtime
 	echo $(HSTNM) > $(MNTDIR)/etc/hostname
+	cp first-boot.sh $(MNTDIR)/usr/local/bin/first-boot.sh
 	chmod 755 $(MNTDIR)/usr/local/bin/first-boot.sh
+
+run-post-install: post-install
 	chroot $(MNTDIR) /usr/local/bin/post-install.sh
 
 nuser:
@@ -90,7 +92,7 @@ nuser:
 	chroot $(MNTDIR) passwd $(NUSRNAME)
 	#chroot $(MNTDIR) dot-install $(NUSRNAME)
 
-laptop: metal python xorg audio wifi post-install nuser
+laptop: metal wifi xorg audio run-post-install nuser
 
 archive:
 	tar -cvpjf void-fs.tar.bz2 \