Compare commits
No commits in common. "4af04f573d38714caf02793c970e6ed3564f1fcb" and "20dde17cdb763819deee7d9b400936fdbeb10084" have entirely different histories.
4af04f573d
...
20dde17cdb
28
Makefile
28
Makefile
|
@ -1,7 +1,7 @@
|
||||||
include config.mk
|
include config.mk
|
||||||
|
|
||||||
define vinstall
|
define vinstall
|
||||||
export XBPS_ARCH=$(VOID_ARCH) && xbps-install -Suy -R $(VOID_REPO) -r $(MNTDIR) $(1)
|
export XBPS_ARCH=$(VOID_ARCH) && xbps-install -Su -R $(VOID_REPO) -r $(MNTDIR) $(1)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
base-fs:
|
base-fs:
|
||||||
|
@ -22,13 +22,6 @@ umnt-system:
|
||||||
base: base-fs mnt-system
|
base: base-fs mnt-system
|
||||||
$(call vinstall,base-system)
|
$(call vinstall,base-system)
|
||||||
|
|
||||||
base-from-archive:
|
|
||||||
tar -xpf $(VOID_ARCHIVE) -C $(MNTDIR)
|
|
||||||
mount -t proc proc $(MNTDIR)/proc
|
|
||||||
mount -t sysfs sys $(MNTDIR)/sys
|
|
||||||
mount -o bind /dev $(MNTDIR)/dev
|
|
||||||
mount -t devpts pts $(MNTDIR)/dev/pts
|
|
||||||
|
|
||||||
set-term:
|
set-term:
|
||||||
cp -r files/terminfo $(MNTDIR)/usr/share/
|
cp -r files/terminfo $(MNTDIR)/usr/share/
|
||||||
chmod -R 755 $(MNTDIR)/usr/share/terminfo
|
chmod -R 755 $(MNTDIR)/usr/share/terminfo
|
||||||
|
@ -40,23 +33,4 @@ set-resolv:
|
||||||
tools:
|
tools:
|
||||||
$(call vinstall,base-devel git tcc wget vim-x11 tmux)
|
$(call vinstall,base-devel git tcc wget vim-x11 tmux)
|
||||||
|
|
||||||
archive:
|
|
||||||
tar -cvpjf void-fs.tar.bz2 \
|
|
||||||
--exclude=./dev/* \
|
|
||||||
--exclude=./proc/* \
|
|
||||||
--exclude=./sys/* \
|
|
||||||
--exclude=./tmp/* \
|
|
||||||
--exclude=./run/* \
|
|
||||||
-C $(MNTDIR) .
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
scripts:
|
|
||||||
cp scripts/* $(MNTDIR)/usr/local/bin/
|
|
||||||
chmod 755 $(MNTDIR)/usr/local/bin/*
|
|
||||||
|
|
||||||
lilo: set-fstab scripts
|
|
||||||
$(call vinstall,lilo)
|
|
||||||
chroot $(MNTDIR) lilo-conf-mkr.sh $(LBOOT)
|
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
VOID_ARCH=x86_64
|
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
|
|
||||||
|
|
||||||
DRIVE=/dev/sdb1
|
DRIVE=/dev/sdb1
|
||||||
LBOOT=/dev/sdb
|
|
||||||
|
|
||||||
MNTDIR=/mnt
|
MNTDIR=/mnt
|
||||||
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
#<device> <dir> <type> <options> <dump> <fsck>
|
|
|
@ -1,32 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
IMG=$(ls /boot/vmlinuz*|sort -r|sed 1q)
|
|
||||||
|
|
||||||
VERS=$(echo $IMG | sed 's/\/boot\/vmlinuz-//')
|
|
||||||
|
|
||||||
INIT=/boot/initramfs-$VERS.img
|
|
||||||
|
|
||||||
ROOT_UUID=$(cat /etc/fstab|grep "UUID"|awk '{print $1}')
|
|
||||||
|
|
||||||
LBOOT="$1"
|
|
||||||
|
|
||||||
|
|
||||||
#global setup
|
|
||||||
printf "boot=$LBOOT
|
|
||||||
prompt
|
|
||||||
timeout=150
|
|
||||||
lba32
|
|
||||||
root=\"$ROOT_UUID\"
|
|
||||||
vga=normal
|
|
||||||
read-only
|
|
||||||
menu-title=\"edbarz9's computer\"
|
|
||||||
\n\n
|
|
||||||
|
|
||||||
#image setup
|
|
||||||
image = $IMG
|
|
||||||
\tlabel = \"$VERS\"
|
|
||||||
\t#root = \"$ROOT_UUID\"
|
|
||||||
\tread-only
|
|
||||||
\tinitrd = $INIT\n" > /etc/lilo.conf
|
|
||||||
|
|
||||||
lilo
|
|
Loading…
Reference in New Issue