summaryrefslogtreecommitdiff
path: root/vasile-kogaion
diff options
context:
space:
mode:
Diffstat (limited to 'vasile-kogaion')
-rwxr-xr-xvasile-kogaion36
1 files changed, 18 insertions, 18 deletions
diff --git a/vasile-kogaion b/vasile-kogaion
index d462293..6256913 100755
--- a/vasile-kogaion
+++ b/vasile-kogaion
@@ -22,11 +22,11 @@ export local overlaydir="overlaydir"
export local chrootuser="root"
export local chroottarget="${@:2}"
export local chrootbuildtarget="emerge -kav "$chroottarget""
-export local chrootdevtree="/usr/share/vasile-kogaion/devmod"
+export local chrootdevtree="/usr/share/vasile-kogaion/devmode"
export local chrootmainoverlay="layman -f -a "$releasename"-"$releasetarget" -o https://gitlab.com/"$releasename"/"$releasename"-"$releasetarget"/raw/master/overlay.xml"
export local chrootbuildgit="cd /opt && git clone https://gitlab.com/"$releasename"/"$releasename"-build.git"
export local chrootportageconfig="ln -sf /opt/"$releasename"-build/conf/intel/portage /etc/portage"
-export local chrootmakeconfx64="ln -sf /opt/"$releasename"-build/conf/intel/portage/make.conf.amd64-devel /etc/portage/make.conf"
+export local chrootmakeconf="ln -sf /opt/"$releasename"-build/conf/intel/portage/make.conf.amd64-devel /etc/portage/make.conf"
export local chrootenvupdate="/usr/sbin/env-update && . /etc/profile"
export local chrootprofile="eselect profile set 1"
@@ -37,7 +37,7 @@ export local bootcorefiles="/tmp/bootcore/cdroot/boot"
export local isouser="root"
export local isotarget="${@:2}"
export local isoinstalltarget="emerge -Kav "$isotarget""
-export local isousertree="/usr/share/vasile-kogaion/usermod"
+export local isousertree="/usr/share/vasile-kogaion/usermode"
export local isomainoverlay="layman -f -a "$releasename"-"$releasetarget" -o https://gitlab.com/"$releasename"/"$releasename"-"$releasetarget"/raw/master/overlay.xml"
export local isobuildgit="cd /opt && git clone https://gitlab.com/"$releasename"/"$releasename"-build.git"
export local isoportageconfig="ln -sf /opt/"$releasename"-build/conf/intel/portage /etc/portage"
@@ -46,19 +46,19 @@ export local isoprofile="eselect profile set 1"
export local isodracutcmd="dracut -N -a dmsquash-live -a pollcdrom -o systemd -o systemd-initrd -o systemd-networkd -o dracut-systemd --force --kver "$kernelver""
export local isodracutrd="initramfs-"$kernelver".img"
export local isoeficmd="grub2-mkimage -d /usr/lib64/grub/x86_64-efi -o bootx64.efi -O x86_64-efi ext2 fat udf btrfs ntfs reiserfs xfs hfsplus lvm ata part_msdos part_gpt part_apple bsd search_fs_uuid normal chain iso9660 configfile help loadenv reboot cat search memdisk tar boot linux chain"
-export local isomainarchx64="x86_64"
-export local isomakeconfx64="ln -sf /opt/"$releasename"-build/conf/intel/portage/make.conf.amd64-user /etc/portage/make.conf"
-export local isorootdirx64=""$releasename"-"$releasetarget"-"$releaseversion"-"$isomainarchx64""
-export local isokernelnamex64="kernel-genkernel-"$isomainarchx64"-"$kernelver""
-export local isostagingdirx64="/tmp/"$isorootdirx64""
-export local isosupersquashdirx64=""$isorootdirx64"/CDroot"
-export local isolivesqfsdirx64=""$isosupersquashdirx64"/LiveOS"
-export local isoliveosdirx64=""$isorootdirx64"/LiveOS"
-export local isosyncdirx64=""$isorootdirx64"/rootfs"
-export local isobootdirx64=""$isorootdirx64"/boot/grub"
-export local isoefibootdirx64=""$isorootdirx64"/efi/boot"
-export local dracutrdx64="initramfs-genkernel-"$isomainarchx64"-"$kernelver""
-export local dracutcmdx64="dracut -N -o systemd -o systemd-initrd -o systemd-networkd -o dracut-systemd --force --kver "$kernelver" "/boot/"$dracutrdx64"""
+export local isomainarch="x86_64"
+export local isomakeconf="ln -sf /opt/"$releasename"-build/conf/intel/portage/make.conf.amd64-user /etc/portage/make.conf"
+export local isorootdir=""$releasename"-"$releasetarget"-"$releaseversion"-"$isomainarchx64""
+export local isokernelname="kernel-genkernel-"$isomainarch"-"$kernelver""
+export local isostagingdir="/tmp/"$isorootdir""
+export local isosupersquashdir=""$isorootdir"/CDroot"
+export local isolivesqfsdir=""$isosupersquashdir"/LiveOS"
+export local isoliveosdir=""$isorootdir"/LiveOS"
+export local isosyncdir=""$isorootdir"/rootfs"
+export local isobootdir=""$isorootdir"/boot/grub"
+export local isoefibootdir=""$isorootdir"/efi/boot"
+export local dracutrd="initramfs-genkernel-"$isomainarch"-"$kernelver""
+export local dracutcmd="dracut -N -o systemd -o systemd-initrd -o systemd-networkd -o dracut-systemd --force --kver "$kernelver" "/boot/"$dracutrd"""
source /usr/lib/vasile-kogaion/libvasile-kogaion
@@ -71,8 +71,8 @@ case $1 in
echo -e "Usage: vasile-kogaion [options]"
echo -e ""
echo -e "Options:"
- echo -e "--build64 : build package/target in a clean x64 squashed core"
- echo -e "--iso64 : build x64 iso based on clean squashed core + targets"
+ echo -e "--build : build package/target in a clean squashed core"
+ echo -e "--iso : build iso based on clean squashed core + targets"
echo -e "--help : display this help and exit"
echo -e ""
;;