From de64bb64cf11dc0ec6e35866840cadd0f0206939 Mon Sep 17 00:00:00 2001
From: ed <ed@brz9.dev>
Date: Sat, 2 May 2020 17:47:35 +0200
Subject: [PATCH] sys mount, passwd, fstab, grub ok to boot

---
 Makefile  | 32 +++++++++++++++++---------------
 config.mk |  6 +++---
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 6610e2f..bae3d7c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,20 +4,25 @@ define vinstall
 	export XBPS_ARCH=$(VOID_ARCH) && xbps-install -Suy -R $(VOID_REPO) -r $(MNTDIR) $(1)
 endef
 
-base-fs:
-	$(call vinstall,base-files)
-
 mnt-system:
-	mount --types proc /proc $(MNTDIR)/proc
-	mount --rbind /sys $(MNTDIR)/sys
+	mkdir -p $(MNTDIR)/dev
+	mkdir -p $(MNTDIR)/proc
+	mkdir -p $(MNTDIR)/sys
+	mkdir -p $(MNTDIR)/run
 	mount --rbind /dev $(MNTDIR)/dev
-	mount --make-rslave $(MNTDIR)/sys
+	mount --rbind /proc $(MNTDIR)/proc
+	mount --rbind /sys $(MNTDIR)/sys
+	mount --rbind /run $(MNTDIR)/run
 	mount --make-rslave $(MNTDIR)/dev
+	mount --make-rslave $(MNTDIR)/proc
+	mount --make-rslave $(MNTDIR)/sys
+	mount --make-rslave $(MNTDIR)/run
 
 umnt-system:
 	umount $(MNTDIR)/proc
 	umount $(MNTDIR)/sys
 	umount $(MNTDIR)/dev
+	umount $(MNTDIR)/run
 
 mnt-drive:
 	mount $(DRIVE) $(MNTDIR)
@@ -25,7 +30,7 @@ mnt-drive:
 umnt-drive: umnt-system
 	umount $(DRIVE)
 
-base: base-fs mnt-system
+base:
 	$(call vinstall,base-system)
 
 base-from-archive:
@@ -38,6 +43,11 @@ base-from-archive:
 set-term:
 	$(call vinstall,st-terminfo)
 
+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
 	cp files/resolv.conf.head $(MNTDIR)/etc/resolv.conf
@@ -58,14 +68,6 @@ set-fstab:
 	cp files/fstab $(MNTDIR)/etc/fstab
 	echo "$(shell file -s $(DRIVE)|tr ' ' '\n'|grep UUID) / ext4 rw,noatime,discard 0 1" >> $(MNTDIR)/etc/fstab
 
-cp-script:
-	cp scripts/* $(MNTDIR)/usr/local/bin/
-	chmod 755 $(MNTDIR)/usr/local/bin/*
-
-lilo: set-fstab cp-script
-	$(call vinstall,lilo,perl)
-	chroot $(MNTDIR) lilo-conf-mkr.sh $(BOOTLDR)
-
 grub:
 	$(call vinstall,grub)
 	mkdir $(MNTDIR)/boot/grub
diff --git a/config.mk b/config.mk
index 72a2731..5a013ec 100644
--- a/config.mk
+++ b/config.mk
@@ -2,10 +2,10 @@ VOID_ARCH=x86_64
 VOID_REPO="https://alpha.de.repo.voidlinux.org/current"
 VOID_ARCHIVE=void-fs.tar.bz2
 
-DRIVE=/dev/sdb1
-BOOTLDR=/dev/sdb
+DRIVE=/dev/sdc1
+BOOTLDR=/dev/sdc
 
-MNTDIR=/mnt
+MNTDIR=/mnt/void
 
 TIMEZN=Europe/Paris