summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@rogentos.ro>2016-01-01 21:01:32 +0000
committerV3n3RiX <venerix@rogentos.ro>2016-01-01 21:01:32 +0000
commit36a78a0662389900795d2b17602a0f220ee9d636 (patch)
treea870c0b0861df01534871da5c1739cb34dbc634b
parent1ac0308c39636711be8ec532e0ec19d43e61ffa3 (diff)
baby steps, but we're getting there...Fedora ISO layout
-rwxr-xr-xiso3215
-rwxr-xr-xiso6415
2 files changed, 14 insertions, 16 deletions
diff --git a/iso32 b/iso32
index 29fba4d..c4e24be 100755
--- a/iso32
+++ b/iso32
@@ -9,11 +9,12 @@ makeisox86 () {
# create live iso layout
mkdir -p "$coremntx86"
mkdir -p "$isobootx86"
+ mkdir -p "$liverootfsx86"
# mount && copy our core stage 4 image
mount -t squashfs "$chrootx86" "$coremntx86"
- rsync -aHAXr --progress "$coremntx86/" "$livedirx86/"
- cp -avx ""$livedirx86"/boot/"$kernelnamex86"" ""$isonamex86"/boot/vmlinuz"
- cp -avx ""$livedirx86"/boot/"$ramfsnamex86"" ""$isonamex86"/boot/initrd"
+ rsync -aHAXr --progress "$coremntx86/" "$syncdirx86/"
+ cp -avx ""$syncdirx86"/boot/"$kernelnamex86"" ""$isonamex86"/boot/vmlinuz"
+ cp -avx ""$syncdirx86"/boot/"$ramfsnamex86"" ""$isonamex86"/boot/initrd"
sha256sum ""$isonamex86"/boot/vmlinuz" | tee ""$isonamex86"/boot/vmlinuz.sha256"
sha256sum ""$isonamex86"/boot/initrd" | tee ""$isonamex86"/boot/initrd.sha256"
# configure portage && give up control for package / desktop environment installation
@@ -23,10 +24,8 @@ makeisox86 () {
isochrootx86
isostopx86
# squash live environment
- mksquashfs "$livedirx86" ""$livedirx86".squashfs" -b 1048576 -comp xz -Xdict-size 100%
- sha256sum ""$livedirx86".squashfs" | tee ""$livedirx86".squashfs.sha256"
- # enable live boot
- touch ""$isonamex86"/livecd"
+ mksquashfs "$syncdirx86" ""$syncdirx86".img" -b 1048576 -comp xz -Xdict-size 100%
+ sha256sum ""$syncdirx86".img" | tee ""$syncdirx86".img.sha256"
}
bootcorex86 () {
@@ -36,7 +35,7 @@ bootcorex86 () {
}
cleanupisox86 () {
- rm -rf "$livedirx86"
+ rm -rf "$syncdirx86"
rm -rf "$bootcorepath"
umount "$coremntx86"
}
diff --git a/iso64 b/iso64
index 695ff4b..54e04bd 100755
--- a/iso64
+++ b/iso64
@@ -10,12 +10,13 @@ makeisox64 () {
mkdir -p "$coremntx64"
mkdir -p "$isobootx64"
mkdir -p "$isoefibootx64"
+ mkdir -p "$liverootfsx64"
# mount && copy our core stage 4 image
mount -t squashfs "$chrootx64" "$coremntx64"
- rsync -aHAXr --progress "$coremntx64/" "$livedirx64/"
+ rsync -aHAXr --progress "$coremntx64/" "$syncdirx64/"
# copy our kernel
- cp -avx ""$livedirx64"/boot/"$kernelnamex64"" ""$isonamex64"/boot/vmlinuz"
- cp -avx ""$livedirx64"/boot/"$ramfsnamex64"" ""$isonamex64"/boot/initrd"
+ cp -avx ""$syncdirx64"/boot/"$kernelnamex64"" ""$isonamex64"/boot/vmlinuz"
+ cp -avx ""$syncdirx64"/boot/"$ramfsnamex64"" ""$isonamex64"/boot/initrd"
sha256sum ""$isonamex64"/boot/vmlinuz" | tee ""$isonamex64"/boot/vmlinuz.sha256"
sha256sum ""$isonamex64"/boot/initrd" | tee ""$isonamex64"/boot/initrd.sha256"
# configure portage && give up control for package / desktop environment installation
@@ -25,10 +26,8 @@ makeisox64 () {
isochrootx64
isostopx64
# squash live environment
- mksquashfs "$livedirx64" ""$livedirx64".squashfs" -b 1048576 -comp xz -Xdict-size 100%
- sha256sum ""$livedirx64".squashfs" | tee ""$livedirx64".squashfs.sha256"
- # enable live boot
- touch ""$isonamex64"/livecd"
+ mksquashfs "$syncdirx64" ""$syncdirx64".img" -b 1048576 -comp xz -Xdict-size 100%
+ sha256sum ""$syncdirx64".img" | tee ""$syncdirx64".img.sha256"
}
bootcorex64 () {
@@ -38,7 +37,7 @@ bootcorex64 () {
}
cleanupisox64 () {
- rm -rf "$livedirx64"
+ rm -rf "$syncdirx64"
rm -rf "$bootcorepath"
umount "$coremntx64"
}