git.annexia.org
/
virt-p2v.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basic device detection.
[virt-p2v.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
329d4ce
..
0124250
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-27,11
+27,9
@@
all:
@echo "make build Build the live CD ISO"
@echo "make boot [ISO=foo.iso] Boot built/named ISO (uses qemu)"
@echo "make build Build the live CD ISO"
@echo "make boot [ISO=foo.iso] Boot built/named ISO (uses qemu)"
-build: livecd
-test
.ks
+build: livecd.ks
rm -f $(LABEL).iso
rm -f $(LABEL).iso
- livecd-creator \
- --config=$< \
- --fslabel=$(LABEL)
+ livecd-creator --config=$< --fslabel=$(LABEL)
ls -lhtr *.iso
ISO = $(LABEL).iso
ls -lhtr *.iso
ISO = $(LABEL).iso
@@
-39,7
+37,7
@@
ISO = $(LABEL).iso
boot:
qemu -m 512 -cdrom $(ISO)
boot:
qemu -m 512 -cdrom $(ISO)
-livecd
-test.ks: livecd-test
.ks.in livecd-post.sh Makefile
+livecd
.ks: livecd
.ks.in livecd-post.sh Makefile
sed \
-e 's|@BASEREPO@|$(BASEREPO)|g' \
-e 's|@LANG@|$(LANG)|g' \
sed \
-e 's|@BASEREPO@|$(BASEREPO)|g' \
-e 's|@LANG@|$(LANG)|g' \
@@
-47,13
+45,15
@@
livecd-test.ks: livecd-test.ks.in livecd-post.sh Makefile
-e 's|@TIMEZONE@|$(TIMEZONE)|g' \
< $< | cat - livecd-post.sh > $@
-e 's|@TIMEZONE@|$(TIMEZONE)|g' \
< $< | cat - livecd-post.sh > $@
-livecd-post.sh: livecd-post.sh.in p2v.init virt-p2v.sh Makefile
+livecd-post.sh: livecd-post.sh.in p2v.init virt-p2v.sh
inittab
Makefile
sed \
-e '/@P2V.INIT@/ r p2v.init' \
-e '/@P2V.INIT@/ d' \
-e '/@VIRT-P2V.SH@/ r virt-p2v.sh' \
-e '/@VIRT-P2V.SH@/ d' \
sed \
-e '/@P2V.INIT@/ r p2v.init' \
-e '/@P2V.INIT@/ d' \
-e '/@VIRT-P2V.SH@/ r virt-p2v.sh' \
-e '/@VIRT-P2V.SH@/ d' \
+ -e '/@INITTAB@/ r inittab' \
+ -e '/@INITTAB@/ d' \
< $< > $@
clean:
< $< > $@
clean:
- rm -f *~ core livecd
-test
.ks livecd-post.sh
+ rm -f *~ core livecd.ks livecd-post.sh