From a299245ad4b5e0df7047ec0cf282f465a2358497 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 3 Jan 2016 23:21:11 +0000
Subject: with this commit vasile becomes able to create iso's ... hurray
---
iso32 | 13 +++++++++----
iso64 | 13 +++++++++----
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/iso32 b/iso32
index 4ccf3b1..ad8144a 100755
--- a/iso32
+++ b/iso32
@@ -5,7 +5,7 @@
kernelconfig
checkroot
-makeisox86 () {
+prepareisox86 () {
# we really need this folder as quick as possible
mkdir -p "$isosyncdirx86"
# create an empty 15GB ext4 fs were our rootfs will stay
@@ -45,7 +45,7 @@ makeisox86 () {
mv ""$isorootdirx86"/squashfs.img" "$isoliveosdirx86"
}
-bootcorex86 () {
+bootcoreisox86 () {
# configure live bootloader
git clone https://gitlab.com/rogentos/boot-core.git "$bootcorepath"
cp -avx "$bootcorefiles" "$isorootdirx86"
@@ -59,11 +59,16 @@ cleanupisox86 () {
rm -rf "$isosupersquashdirx86"
}
+makeisox86 () {
+ grub2-mkrescue -o ""$releasename"-"$releasetarget"-"$releaseversion"-"$isomainarchx86".iso" "$isorootdirx86"
+}
+
main () {
chrootchecksumx86
- makeisox86
- bootcorex86
+ prepareisox86
+ bootcoreisox86
cleanupisox86
+ makeisox86
}
main
diff --git a/iso64 b/iso64
index 563dd05..ce20b8d 100755
--- a/iso64
+++ b/iso64
@@ -5,7 +5,7 @@
kernelconfig
checkroot
-makeisox64 () {
+prepareisox64 () {
# we really need this folder as quick as possible
mkdir -p "$isosyncdirx64"
# create an empty 15GB ext4 fs were our rootfs will stay
@@ -46,7 +46,7 @@ makeisox64 () {
mv ""$isorootdirx64/"squashfs.img" "$isoliveosdirx64"
}
-bootcorex64 () {
+bootcoreisox64 () {
# configure live bootloader
git clone https://gitlab.com/rogentos/boot-core.git "$bootcorepath"
cp -avx "$bootcorefiles" "$isorootdirx64"
@@ -60,11 +60,16 @@ cleanupisox64 () {
rm -rf "$bootcorepath"
}
+makeisox64 () {
+ grub2-mkrescue -o ""$releasename"-"$releasetarget"-"$releaseversion"-"$isomainarchx64".iso" "$isorootdirx64"
+}
+
main () {
chrootchecksumx64
- makeisox64
- bootcorex64
+ prepareisox64
+ bootcoreisox64
cleanupisox64
+ makeisox64
}
main
--
cgit v1.2.3