aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristos.K <freedomrfox@gmail.com>2017-07-06 21:36:05 +0300
committerChristos.K <freedomrfox@gmail.com>2017-07-06 21:36:05 +0300
commitcbb47aed6e2373522b2782eae10cfce293be3845 (patch)
treeef96ca26b651b52cd9b91fdc2c462c4b5bc02e8e
parentUpdated controller modules (still very unstable) (diff)
downloadGSE-cbb47aed6e2373522b2782eae10cfce293be3845.tar.gz
GSE-cbb47aed6e2373522b2782eae10cfce293be3845.tar.bz2
GSE-cbb47aed6e2373522b2782eae10cfce293be3845.zip
Minor changes
-rwxr-xr-xscripts/chroot_scripts/cfunctions3
-rwxr-xr-xscripts/functions/sinit_functions10
2 files changed, 7 insertions, 6 deletions
diff --git a/scripts/chroot_scripts/cfunctions b/scripts/chroot_scripts/cfunctions
index b1763b4..d6e27ab 100755
--- a/scripts/chroot_scripts/cfunctions
+++ b/scripts/chroot_scripts/cfunctions
@@ -160,7 +160,8 @@ dist_ccashe_f() {
export emerge_mode
rc-service distccd start
-
+echo "$emerge_mode"
+exit 1
if [[ "${_cflag_ccache}" ]]; then
if [[ ! "$(command -v ccache)" ]]; then
echo -e "Configuring [\e[32mccache\e[0m]"
diff --git a/scripts/functions/sinit_functions b/scripts/functions/sinit_functions
index 9afd4e6..eddfa2f 100755
--- a/scripts/functions/sinit_functions
+++ b/scripts/functions/sinit_functions
@@ -24,9 +24,9 @@ parameters_check() {
sleep 2
fi
- if [[ "$(echo "$@" | grep '\--verbose')" || "$(echo "$@" | grep '\-v')" ]] && ! echo "$@" | grep -q '\--auto=yes'; then
- die "Error: Verbose & interactive mode can not be set at the same time. To use verbose, please set --auto=yes"
- fi
+ #if [[ "$(echo "$@" | grep '\--verbose')" || "$(echo "$@" | grep '\-v')" ]] && ! echo "$@" | grep -q '\--auto=yes'; then
+ # die "Error: Verbose & interactive mode can not be set at the same time. To use verbose, please set --auto=yes"
+ #fi
if [[ "$(echo "$@" | grep '\--quiet')" || "$(echo "$@" | grep '\-q')" ]] && [[ "$(echo "$@" | grep '\--verbose')" || "$(echo "$@" | grep '\-v')" ]]; then
die "Error: verbose & quiet can not be set at the same time"
@@ -369,7 +369,7 @@ _start_again() {
fi
unset YN
- set -x
+ set_x
}
_extract_tarball() {
@@ -2165,7 +2165,7 @@ _prepare_chroot() {
die "Chrooting configuration failed"
fi
else
- if chroot "$1" "sinit.d/chroot_init" "$@" "_flag_new"; then
+ if chroot "$1" "sinit.d/chroot_init" "$@"; then
_o_report_back "Chroot staged finished"
else
die "Chrooting configuration failed"