Inconsolata font is awefull in TTY
This commit is contained in:
parent
46f92bf234
commit
ca47878e70
12
Makefile
12
Makefile
|
@ -1,20 +1,10 @@
|
|||
tuto1: login-app/login-app token-validator/token-validator login-initrd.img server.iso
|
||||
|
||||
fonts: fonts/Inconsolata-16b.psf fonts/Inconsolata-16r.psf fonts/Inconsolata-32b.psf fonts/Inconsolata-32r.psf
|
||||
fonts/Inconsolata-16b.psf:
|
||||
wget https://github.com/xeechou/Inconsolata-psf/raw/master/Inconsolata-16b.psf
|
||||
fonts/Inconsolata-16r.psf:
|
||||
wget https://github.com/xeechou/Inconsolata-psf/raw/master/Inconsolata-16r.psf
|
||||
fonts/Inconsolata-32b.psf:
|
||||
wget https://github.com/xeechou/Inconsolata-psf/raw/master/Inconsolata-32b.psf
|
||||
fonts/Inconsolata-32r.psf:
|
||||
wget https://github.com/xeechou/Inconsolata-psf/raw/master/Inconsolata-32r.psf
|
||||
|
||||
token-validator/token-validator: token-validator/*.go
|
||||
go generate ./token-validator
|
||||
GOOS=linux GOARM=5 GOARCH=arm go build -tags netgo -ldflags '-w -extldflags "-static"' -o $@ ./token-validator
|
||||
|
||||
challenge-initrd.img: challenge.yml subject/adlin.6.gz subject/adlin-TP1-topologie.png fonts/Inconsolata-16b.psf.gz fonts/Inconsolata-16r.psf.gz fonts/Inconsolata-32b.psf.gz fonts/Inconsolata-32r.psf.gz pkg/challenge/adlin pkg/challenge/issue pkg/challenge/init
|
||||
challenge-initrd.img: challenge.yml subject/adlin.6.gz subject/adlin-TP1-topologie.png pkg/challenge/adlin pkg/challenge/issue pkg/challenge/init
|
||||
linuxkit build $<
|
||||
|
||||
server.iso: server.yml students.csv ssl/fullchain.pem ssl/privkey.pem challenge-initrd.img challenge-kernel login-initrd.img
|
||||
|
|
|
@ -22,20 +22,6 @@ files:
|
|||
source: subject/adlin-TP1-topologie.png
|
||||
mode: "0644"
|
||||
|
||||
# Fonts
|
||||
- path: /usr/share/consolefonts/Inconsolata-16b.psf.gz
|
||||
source: fonts/Inconsolata-16b.psf.gz
|
||||
mode: "0644"
|
||||
- path: /usr/share/consolefonts/Inconsolata-16r.psf.gz
|
||||
source: fonts/Inconsolata-16r.psf.gz
|
||||
mode: "0644"
|
||||
- path: /usr/share/consolefonts/Inconsolata-32b.psf.gz
|
||||
source: fonts/Inconsolata-32b.psf.gz
|
||||
mode: "0644"
|
||||
- path: /usr/share/consolefonts/Inconsolata-32r.psf.gz
|
||||
source: fonts/Inconsolata-32r.psf.gz
|
||||
mode: "0644"
|
||||
|
||||
- path: bin/adlin
|
||||
source: pkg/challenge/adlin
|
||||
mode: "0755"
|
||||
|
|
|
@ -26,9 +26,6 @@ USER_IP=$(cmdline adlin.ip)
|
|||
# Define hostname
|
||||
hostname adlin-${USER_LOGIN}
|
||||
|
||||
# Change font
|
||||
zcat /usr/share/consolefonts/Inconsolata-16r.psf.gz | loadfont
|
||||
|
||||
# Launch some TTYs
|
||||
for i in `seq 2 6`
|
||||
do
|
||||
|
|
Reference in New Issue