ed
/
barzvoid
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ask for root password at the end, just before new user to prevent install from halting

This commit is contained in:
ed barz 2020-10-30 13:47:24 +01:00
parent 09719f943f
commit 061a1ab586
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -40,7 +40,6 @@ set-term:
set-root: set-root:
chroot $(MNTDIR) chown root:root / chroot $(MNTDIR) chown root:root /
chroot $(MNTDIR) chmod 755 / chroot $(MNTDIR) chmod 755 /
chroot $(MNTDIR) passwd root
set-resolv: set-resolv:
cp files/resolv.conf.head $(MNTDIR)/etc/resolv.conf.head 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-mkconfig -o /boot/grub/grub.cfg
chroot $(MNTDIR) grub-install $(BOOTLDR) 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: python:
$(call vinstall,python3 python3-pip python3-pipenv) $(call vinstall,python3 python3-pip python3-pipenv)
@ -85,12 +82,17 @@ post-install: tools
chmod 755 $(MNTDIR)/usr/local/bin/first-boot.sh chmod 755 $(MNTDIR)/usr/local/bin/first-boot.sh
chroot $(MNTDIR) /usr/local/bin/post-install.sh chroot $(MNTDIR) /usr/local/bin/post-install.sh
set-root-passwd:
chroot $(MNTDIR) passwd root
nuser: nuser:
chroot $(MNTDIR) useradd $(NUSRNAME) -G wheel,audio,lp,scanner chroot $(MNTDIR) useradd $(NUSRNAME) -G wheel,audio,lp,scanner
chroot $(MNTDIR) passwd $(NUSRNAME) chroot $(MNTDIR) passwd $(NUSRNAME)
chroot $(MNTDIR) dot-install $(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: archive:
tar -cvpjf void-fs.tar.bz2 \ tar -cvpjf void-fs.tar.bz2 \