diff options
| -rw-r--r-- | src/backend/c_jail.sh | 3 | ||||
| -rw-r--r-- | src/backend/f_help.sh | 21 | ||||
| -rw-r--r-- | src/backend/f_makeiso.sh | 6 | ||||
| -rw-r--r-- | src/backend/f_makepkg.sh | 6 | ||||
| -rw-r--r-- | src/backend/f_modeswitch.sh | 74 | ||||
| -rwxr-xr-x | src/frontend/cli/vasile.sh | 8 |
6 files changed, 34 insertions, 84 deletions
diff --git a/src/backend/c_jail.sh b/src/backend/c_jail.sh index 0a486b4..945c964 100644 --- a/src/backend/c_jail.sh +++ b/src/backend/c_jail.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash -export local jailbinmodecmd="vasile --binmode" -export local jailsrcmodecmd="vasile --srcmode" +export local jailsetupcmd="vasile --setup" export local jaildkmscmd="vasile --dkms" export local jailmandbcmd="mandb --create" export local jailportagecmd="emerge -kav "$jailtarget"" diff --git a/src/backend/f_help.sh b/src/backend/f_help.sh index 96b48e1..ab56fd6 100644 --- a/src/backend/f_help.sh +++ b/src/backend/f_help.sh @@ -44,21 +44,16 @@ echo -e "\ the live filesystem will be compressed, live services will be autoenabled, live bootloader autoconfigured and in the end live iso image will be built. You will find a list of predefined live services list hardcoded into "$colorstart"libvasile"$colorstop". Adjust it to suit your needs. - "$colorstart"--binmode"$colorstop" - This option will allow you to change the system state to binmode. In this state portage will allways use only binary packages from the binhost. It will fetch a minimal - portage tree without any ebuilds in it, but only with portage profiles, metadata and eclass. It will also fetch overlay and portage configuration files, and will adjust - "$colorstart"make.conf"$colorstop" for binary only usage. This system state is for those who just meet with the power of Gentoo. + "$colorstart"--reset"$colorstop" + This option will allow you to reset portage. It will remove the portage tree snapshot, the Redcore Linux ebuild overlay, the portage configuration files and reset the system profile. + Usually you will never want to call this option directly, unless you really really really know what are you doing. It is called automatically at setup stage. - !!! WARNING !!! : Never never never modify or create any file in "$colorstart"/etc/portage/"$colorstop" in this state. + "$colorstart"!!! WARNING !!!"$colorstop" + Never never never leave the system in this state. + You will no longer be able to install/remove/upgrade any packages untill you set the system profile, get the portage tree, overlays and configure portage. - "$colorstart"--srcmode"$colorstop" - This option will allow you to change the system state to srcmode. In more clear terms, it will transform your Kogaion/Argent/Redcore system into pure Gentoo. Binary packages - from the binhost will be ignored, and you will only install packages building from portage tree using emerge. It will fetch the full portage tree, the overlay and portage - configuration files and adjust "$colorstart"make.conf"$colorstop" for ebuild only usage. + "$colorstart"--setup"$colorstop" + This option will allow you to setup portage. It will fetch the portage tree snapshot, the Redcore Linux ebuild overlay, the portage configuration files and setup the system profile." - In this system state you can modify whatever you want in "$colorstart"/etc/portage/"$colorstop". You can adjust useflags, keywords, masks, build environment and rebuild the whole system to suit you. - You have the full power of Gentoo available only one command away! - - !!! WARNING !!! : Only use this system state if you have a strong knowledge of Gentoo tools e.g.: "$colorstart"emerge, equery, layman, eix, qlist, useflags, keywords, masks"$colorstop". " exit 0 } diff --git a/src/backend/f_makeiso.sh b/src/backend/f_makeiso.sh index 87e6261..027b9b2 100644 --- a/src/backend/f_makeiso.sh +++ b/src/backend/f_makeiso.sh @@ -20,8 +20,8 @@ jailisodmnt () { umount -l "$jailsynctarget"/var/cache/packages > /dev/null 2>&1 } -jailisobinmode () { - chroot "$jailsynctarget" su - "$jailuser" -c "$jailbinmodecmd" +jailisosetup () { + chroot "$jailsynctarget" su - "$jailuser" -c "$jailsetupcmd" } jailisomkramfs () { @@ -103,7 +103,7 @@ mkliveimg () { sync # chroot into live filesystem image jailisomnt - jailisobinmode + jailisosetup jailisostart jailisodmnt sync diff --git a/src/backend/f_makepkg.sh b/src/backend/f_makepkg.sh index 0c4d0b8..0ee8147 100644 --- a/src/backend/f_makepkg.sh +++ b/src/backend/f_makepkg.sh @@ -44,8 +44,8 @@ jailpkgdmnt () { umount -l "$ropath" > /dev/null 2>&1 } -jailpkgsrcmode () { - chroot "$overlaypath" su - "$jailuser" -c "$jailsrcmodecmd" +jailpkgsetup () { + chroot "$overlaypath" su - "$jailuser" -c "$jailsetupcmd" } jailpkgupgrade () { @@ -65,7 +65,7 @@ makepkg () { checkifroot checkjailsum jailpkgprep - jailpkgsrcmode + jailpkgsetup jailpkgupgrade jailpkgbuild jailpkgstart diff --git a/src/backend/f_modeswitch.sh b/src/backend/f_modeswitch.sh index d16fa13..7d50d0d 100644 --- a/src/backend/f_modeswitch.sh +++ b/src/backend/f_modeswitch.sh @@ -22,14 +22,7 @@ delportcfgtree () { rm -rf "$jailportvcspath" > /dev/null 2>&1 } -resetmode () { - checkifroot - delmainporttree - deladdonporttree - delportcfgtree -} - -getmainportsrctree () { +getmainporttree () { if [ ! -d ""$jailmainportpath"/.git" ] ; then einfo "I am injecting Gentoo ebuild tree" cd "$jailmainportpath" && git init > /dev/null 2>&1 @@ -40,40 +33,11 @@ getmainportsrctree () { fi } -getmainportbintree () { - if [ ! -d ""$jailmainportpath"/.git" ] ; then - einfo "I am injecting Gentoo ebuild tree" - cd "$jailmainportpath" && git init > /dev/null 2>&1 - git remote add origin https://pagure.io/redcore/portage.git - git config core.sparsecheckout true - echo "profiles/*" >> .git/info/sparse-checkout - echo "metadata/*" >> .git/info/sparse-checkout - echo "eclass/*" >> .git/info/sparse-checkout - git pull --depth=1 origin master - git branch -u origin/master master - rm -rf ""$gentooportdir"/profiles/updates" - fi -} - -getaddonportsrctree () { - if [ ! -d ""$jailaddonportpath"/.git" ] ; then - einfo "I am injecting Redcore ebuild tree" - cd "$jailaddonportpath" && git init > /dev/null 2>&1 - git remote add origin https://pagure.io/redcore/redcore-desktop.git - git pull --depth=1 origin master - git branch -u origin/master master - fi -} - -getaddonportbintree () { +getaddonporttree () { if [ ! -d ""$jailaddonportpath"/.git" ] ; then einfo "I am injecting Redcore ebuild tree" cd "$jailaddonportpath" && git init > /dev/null 2>&1 git remote add origin https://pagure.io/redcore/redcore-desktop.git - git config core.sparsecheckout true - echo "profiles/*" >> .git/info/sparse-checkout - echo "metadata/*" >> .git/info/sparse-checkout - echo "eclass/*" >> .git/info/sparse-checkout git pull --depth=1 origin master git branch -u origin/master master fi @@ -86,18 +50,6 @@ getportcfgtree () { popd > /dev/null 2>&1 } -getsrctree () { - getmainportsrctree - getaddonportsrctree - getportcfgtree -} - -getbintree () { - getmainportbintree - getaddonportbintree - getportcfgtree -} - setmakeconf () { ln -sf "$jailportcfgsource" "$jailportcfgtarget" ln -sf "$jailportcfgtarget"/make.conf.amd64-generic "$jailportcfgtarget"/make.conf @@ -117,17 +69,21 @@ setprofile () { . /etc/profile } -setbinmode () { - resetmode - getbintree - setmakeconf - setmakeopts - setprofile +reset () { + checkifroot + delmainporttree + deladdonporttree + delportcfgtree } -setsrcmode () { - resetmode - getsrctree +setup () { + checkifroot + delmainporttree + deladdonporttree + delportcfgtree + getmainporttree + getaddonporttree + getportcfgtree setmakeconf setmakeopts setprofile diff --git a/src/frontend/cli/vasile.sh b/src/frontend/cli/vasile.sh index 51ec3e9..5f3f8d2 100755 --- a/src/frontend/cli/vasile.sh +++ b/src/frontend/cli/vasile.sh @@ -21,11 +21,11 @@ case $1 in --makeiso) makeiso ;; - --binmode) - setbinmode + --reset) + reset ;; - --srcmode) - setsrcmode + --setup) + setup ;; --dkms) makedkms |