diff --git a/blocks-live/ld.cfg b/blocks-live/ld.cfg index 8743381..a9ebdbe 100644 --- a/blocks-live/ld.cfg +++ b/blocks-live/ld.cfg @@ -10,12 +10,12 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c ld.cfg -o ../flat/flat-ld.cfg +# ksflatten -c ld.cfg -o ../leaves/flat-ld.cfg # IMPORTANT : Weak dependencies to be destroyed in the resulting ks # Instructions for livecd-creator (about to be deprecated) # An ISO file can be created using the following command as *root*: -# livecd-creator -c ../flat/flat-ld.cfg --fslabel=ld +# livecd-creator -c ../leaves/flat-ld.cfg --fslabel=ld # livecd-creator is part of the livecd-tools package # Instructions for livemedia-creator @@ -29,7 +29,7 @@ # qemu-kvm -m 2048 -vga qxl phyllome-live-d-x86_64.iso %include bl.cfg # A base for a minimal live machine -%include bd.cfg # A base for a desktop environment +%include "../blocks/bd.cfg" # A base for a desktop environment %post --log=/root/ld.log # Beginning of %post section. The following commands are executed inside a chroot environment. Add logging diff --git a/blocks-live/ldh.cfg b/blocks-live/ldh.cfg index 82ca606..b1d0552 100644 --- a/blocks-live/ldh.cfg +++ b/blocks-live/ldh.cfg @@ -10,12 +10,12 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c ldh.cfg -o ../flat/flat-ldh.cfg +# ksflatten -c ldh.cfg -o ../leaves/flat-ldh.cfg # IMPORTANT : Weak dependencies to be destroyed in the resulting ks # Instructions for livecd-creator (about to be deprecated) # An ISO file can be created using the following command as *root*: -# livecd-creator -c ../flat/flat-ldh.cfg --fslabel=ldh +# livecd-creator -c ../leaves/flat-ldh.cfg --fslabel=ldh # livecd-creator is part of the livecd-tools package # Instructions for livemedia-creator diff --git a/blocks-live/ldha.cfg b/blocks-live/ldha.cfg index 917d379..ef3f3dc 100644 --- a/blocks-live/ldha.cfg +++ b/blocks-live/ldha.cfg @@ -10,12 +10,12 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c ldha.cfg -o ../flat/flat-ldha.cfg +# ksflatten -c ldha.cfg -o ../leaves/flat-ldha.cfg # IMPORTANT : Weak dependencies to be destroyed in the resulting ks # Instructions for livecd-creator (about to be deprecated) # An ISO file can be created using the following command as *root*: -# livecd-creator -c ../flat/flat-ldha.cfg --fslabel=ldha +# livecd-creator -c ../leaves/flat-ldha.cfg --fslabel=ldha # livecd-creator is part of the livecd-tools package # Instructions for livemedia-creator diff --git a/blocks-live/ldhi.cfg b/blocks-live/ldhi.cfg index 59733a1..3c3a170 100644 --- a/blocks-live/ldhi.cfg +++ b/blocks-live/ldhi.cfg @@ -10,17 +10,17 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c ldhi.cfg -o ../flat/flat-ldhi.cfg +# ksflatten -c ldhi.cfg -o ../leaves/flat-ldhi.cfg # IMPORTANT : Weak dependencies to be destroyed in the resulting ks # Instructions for livecd-creator (about to be deprecated) # An ISO file can be created using the following command as *root*: -# livecd-creator -c ../flat/flat-ldhi.cfg --fslabel=ldhi +# livecd-creator -c ../leaves/flat-ldhi.cfg --fslabel=ldhi # livecd-creator is part of the livecd-tools package # Instructions for livemedia-creator # An ISO file can be created using the following command as *root*: -# livemedia-creator --make-iso --ks flat-ldhi.cfg --no-virt --iso-only --iso-name phyllome-live-ldhi-x86_64.iso --releasever 35 +# livemedia-creator --make-iso --ks flat-ldhi.cfg --no-virt --iso-only --iso-name phyllome-live-dhi-x86_64.iso --releasever 35 # The resulting ISO can be tested with qemu-kvm, using the following these two commands, as *root*: # UEFI test: diff --git a/blocks/d.cfg b/blocks/d.cfg index bd8199b..10cb883 100644 --- a/blocks/d.cfg +++ b/blocks/d.cfg @@ -13,7 +13,7 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c d.cfg -o ../flat/flat-d.cfg +# ksflatten -c d.cfg -o ../leaves/flat-d.cfg %include b.cfg # A base system %include bd.cfg # A desktop environment diff --git a/blocks/dh.cfg b/blocks/dh.cfg index d60574a..a8be746 100644 --- a/blocks/dh.cfg +++ b/blocks/dh.cfg @@ -13,7 +13,7 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c dh.cfg -o ../flat/flat-dh.cfg +# ksflatten -c dh.cfg -o ../leaves/flat-dh.cfg %include b.cfg # A minimal machine %include bd.cfg # A desktop environment diff --git a/blocks/dha.cfg b/blocks/dha.cfg index 9a9eac0..fa186ae 100644 --- a/blocks/dha.cfg +++ b/blocks/dha.cfg @@ -13,7 +13,7 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c dha.cfg -o ../flat/flat-dha.cfg +# ksflatten -c dha.cfg -o ../leaves/flat-dha.cfg %include b.cfg # A minimal machine %include bd.cfg # A desktop environment diff --git a/blocks/dhi.cfg b/blocks/dhi.cfg index 4000788..6587f78 100644 --- a/blocks/dhi.cfg +++ b/blocks/dhi.cfg @@ -13,7 +13,7 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c dhi.cfg -o ../flat/flat-dhi.cfg +# ksflatten -c dhi.cfg -o ../leaves/flat-dhi.cfg %include b.cfg # A minimal machine %include bd.cfg # A desktop environment diff --git a/blocks/s.cfg b/blocks/s.cfg index b136cd3..bce7133 100644 --- a/blocks/s.cfg +++ b/blocks/s.cfg @@ -10,7 +10,7 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c s.cfg -o ../flat/flat-s.cfg +# ksflatten -c s.cfg -o ../leaves/flat-s.cfg %include b.cfg # A base system diff --git a/blocks/sh.cfg b/blocks/sh.cfg index 3175dae..fea55da 100644 --- a/blocks/sh.cfg +++ b/blocks/sh.cfg @@ -10,7 +10,7 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c sh.cfg -o ../flat/flat-sh.cfg +# ksflatten -c sh.cfg -o ../leaves/flat-sh.cfg %include b.cfg # A base system %include bh.cfg # A base hypervisor diff --git a/blocks/sha.cfg b/blocks/sha.cfg index 3fc1948..0b90eaa 100644 --- a/blocks/sha.cfg +++ b/blocks/sha.cfg @@ -10,7 +10,7 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c sha.cfg -o ../flat/flat-sha.cfg +# ksflatten -c sha.cfg -o ../leaves/flat-sha.cfg %include b.cfg # Include a base system %include bh.cfg # A base hypervisor diff --git a/blocks/shi.cfg b/blocks/shi.cfg index 2fd1c60..731c763 100644 --- a/blocks/shi.cfg +++ b/blocks/shi.cfg @@ -10,7 +10,7 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c shi.cfg -o ../flat/flat-shi.cfg +# ksflatten -c shi.cfg -o ../leaves/flat-shi.cfg %include b.cfg # Include a base system %include bh.cfg # A base hypervisor