teach/adlin
Archived
0
0
Fork 0
Code Issues 1 Pull Requests 4 Releases Activity

login: use pkg instead of raw compil

Browse Source
This commit is contained in:
nemunaire 2020-02-23 00:04:56 +01:00
parent 2357798b8f
commit e9ec1eb9b9
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -14,12 +14,6 @@ token-validator/token-validator: token-validator/*.go
go generate ./token-validator go generate ./token-validator
GOOS=linux GOARM=5 GOARCH=arm go build -tags netgo -ldflags '-w -extldflags "-static"' -o $@ ./token-validator GOOS=linux GOARM=5 GOARCH=arm go build -tags netgo -ldflags '-w -extldflags "-static"' -o $@ ./token-validator
login-app/login-app: login-app/*.go
GOOS=linux GOARCH=amd64 go build -tags netgo -ldflags '-w -extldflags "-static -lncurses"' -o $@ ./login-app
login-initrd.img: login.yml login-app/login-app
linuxkit build $<
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 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
linuxkit build $< linuxkit build $<

13
login.yml
View File

@ -4,21 +4,12 @@ kernel:
init: init:
- busybox - busybox
- nemunaire/adlin-login-app:34d62f18f7f44907f61d37f774d4fda864ebab55
files: files:
- path: /bin/login
source: login-app/login-app
mode: "0755"
- path: /etc/terminfo/l/linux
source: /etc/terminfo/l/linux
mode: "0644"
- path: /etc/ssl/certs/DST_Root_CA_X3.pem - path: /etc/ssl/certs/DST_Root_CA_X3.pem
source: /etc/ssl/certs/DST_Root_CA_X3.pem source: /etc/ssl/certs/DST_Root_CA_X3.pem
mode: "0644" mode: "0644"
- path: /usr/share/udhcpc/default.script
source: /usr/share/udhcpc/default.script
mode: "0755"
- path: /init - path: /init
contents: | contents: |
@ -51,7 +42,7 @@ files:
} > /dev/null 2> /dev/null & } > /dev/null 2> /dev/null &
grep adlin.debug=1 /proc/cmdline > /dev/null && /bin/sh grep adlin.debug=1 /proc/cmdline > /dev/null && /bin/sh
/bin/login /bin/login-app
reboot -f reboot -f
mode: "0755" mode: "0755"