From 061a1ab58630f06097b0cc3736836f35af347943 Mon Sep 17 00:00:00 2001 From: ed Date: Fri, 30 Oct 2020 13:47:24 +0100 Subject: [PATCH] ask for root password at the end, just before new user to prevent install from halting --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8f6c5ed..b851857 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,6 @@ set-term: set-root: chroot $(MNTDIR) chown root:root / chroot $(MNTDIR) chmod 755 / - chroot $(MNTDIR) passwd root set-resolv: cp files/resolv.conf.head $(MNTDIR)/etc/resolv.conf.head @@ -56,8 +55,6 @@ 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) @@ -85,12 +82,17 @@ post-install: tools chmod 755 $(MNTDIR)/usr/local/bin/first-boot.sh chroot $(MNTDIR) /usr/local/bin/post-install.sh +set-root-passwd: + chroot $(MNTDIR) passwd root + nuser: chroot $(MNTDIR) useradd $(NUSRNAME) -G wheel,audio,lp,scanner chroot $(MNTDIR) passwd $(NUSRNAME) chroot $(MNTDIR) dot-install $(NUSRNAME) -laptop: metal python xorg audio wifi post-install nuser +metal: mnt-drive mnt-system base set-loc set-resolv set-fstab set-root set-keymap set-term grub + +laptop: metal python xorg audio wifi post-install set-root-passwd nuser archive: tar -cvpjf void-fs.tar.bz2 \