refactor archive to the end
This commit is contained in:
parent
97ea8a1c94
commit
846065a165
25
Makefile
25
Makefile
|
@ -27,9 +27,6 @@ umnt:
|
||||||
base:
|
base:
|
||||||
$(call vinstall,base-system)
|
$(call vinstall,base-system)
|
||||||
|
|
||||||
base-from-archive:
|
|
||||||
tar -xpf $(VOID_ARCHIVE) -C $(MNTDIR)
|
|
||||||
|
|
||||||
set-term:
|
set-term:
|
||||||
$(call vinstall,st-terminfo)
|
$(call vinstall,st-terminfo)
|
||||||
|
|
||||||
|
@ -45,15 +42,6 @@ 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:
|
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
|
||||||
|
@ -70,3 +58,16 @@ wifi:
|
||||||
metal: mnt-drive mnt-system base set-resolv set-fstab set-root grub
|
metal: mnt-drive mnt-system base set-resolv set-fstab set-root grub
|
||||||
|
|
||||||
laptop: metal wifi
|
laptop: metal wifi
|
||||||
|
|
||||||
|
archive:
|
||||||
|
tar -cvpjf void-fs.tar.bz2 \
|
||||||
|
--exclude=./dev/* \
|
||||||
|
--exclude=./proc/* \
|
||||||
|
--exclude=./sys/* \
|
||||||
|
--exclude=./tmp/* \
|
||||||
|
--exclude=./run/* \
|
||||||
|
-C $(MNTDIR) .
|
||||||
|
|
||||||
|
base-from-archive:
|
||||||
|
tar -xpf $(VOID_ARCHIVE) -C $(MNTDIR)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue