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

sys mount, passwd, fstab, grub ok to boot

This commit is contained in:
ed barz 2020-05-02 17:47:35 +02:00
parent 6d4cd85700
commit de64bb64cf
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile
View File

@ -4,20 +4,25 @@ define vinstall
export XBPS_ARCH=$(VOID_ARCH) && xbps-install -Suy -R $(VOID_REPO) -r $(MNTDIR) $(1) export XBPS_ARCH=$(VOID_ARCH) && xbps-install -Suy -R $(VOID_REPO) -r $(MNTDIR) $(1)
endef endef
base-fs:
$(call vinstall,base-files)
mnt-system: mnt-system:
mount --types proc /proc $(MNTDIR)/proc mkdir -p $(MNTDIR)/dev
mount --rbind /sys $(MNTDIR)/sys mkdir -p $(MNTDIR)/proc
mkdir -p $(MNTDIR)/sys
mkdir -p $(MNTDIR)/run
mount --rbind /dev $(MNTDIR)/dev 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)/dev
mount --make-rslave $(MNTDIR)/proc
mount --make-rslave $(MNTDIR)/sys
mount --make-rslave $(MNTDIR)/run
umnt-system: umnt-system:
umount $(MNTDIR)/proc umount $(MNTDIR)/proc
umount $(MNTDIR)/sys umount $(MNTDIR)/sys
umount $(MNTDIR)/dev umount $(MNTDIR)/dev
umount $(MNTDIR)/run
mnt-drive: mnt-drive:
mount $(DRIVE) $(MNTDIR) mount $(DRIVE) $(MNTDIR)
@ -25,7 +30,7 @@ mnt-drive:
umnt-drive: umnt-system umnt-drive: umnt-system
umount $(DRIVE) umount $(DRIVE)
base: base-fs mnt-system base:
$(call vinstall,base-system) $(call vinstall,base-system)
base-from-archive: base-from-archive:
@ -38,6 +43,11 @@ base-from-archive:
set-term: set-term:
$(call vinstall,st-terminfo) $(call vinstall,st-terminfo)
set-root:
chroot $(MNTDIR) chown root:root /
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
cp files/resolv.conf.head $(MNTDIR)/etc/resolv.conf cp files/resolv.conf.head $(MNTDIR)/etc/resolv.conf
@ -58,14 +68,6 @@ set-fstab:
cp files/fstab $(MNTDIR)/etc/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 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: grub:
$(call vinstall,grub) $(call vinstall,grub)
mkdir $(MNTDIR)/boot/grub mkdir $(MNTDIR)/boot/grub

6
config.mk
View File

@ -2,10 +2,10 @@ VOID_ARCH=x86_64
VOID_REPO="https://alpha.de.repo.voidlinux.org/current" VOID_REPO="https://alpha.de.repo.voidlinux.org/current"
VOID_ARCHIVE=void-fs.tar.bz2 VOID_ARCHIVE=void-fs.tar.bz2
DRIVE=/dev/sdb1 DRIVE=/dev/sdc1
BOOTLDR=/dev/sdb BOOTLDR=/dev/sdc
MNTDIR=/mnt MNTDIR=/mnt/void
TIMEZN=Europe/Paris TIMEZN=Europe/Paris