From dd2ad023c295423088689a755624063fcc862d9b Mon Sep 17 00:00:00 2001 From: asmeron Date: Tue, 27 Jan 2026 01:28:30 +0600 Subject: [PATCH] Fix debug echo --- ublinux/functions | 25 ++- ublinux/rc.d/rc.desktop | 14 +- ublinux/rc.d/rc.halt | 9 +- ublinux/rc.d/rc.halt.pre | 9 +- ublinux/rc.d/rc.local | 18 +- ublinux/rc.d/rc.network | 12 +- ublinux/rc.d/rc.pamaccount | 10 +- ublinux/rc.d/rc.pamauth | 10 +- ublinux/rc.d/rc.pampassword | 10 +- ublinux/rc.d/rc.pamsession | 10 +- ublinux/rc.d/rc.post | 17 +- ublinux/rc.d/rc.preinit | 6 +- ublinux/rc.d/rc.profile | 21 +- ublinux/rc.desktop/all/autoexec | 7 +- ublinux/rc.desktop/all/bookmarks | 6 +- ublinux/rc.desktop/all/chromium | 7 + ublinux/rc.desktop/all/fusion-icon | 7 +- ublinux/rc.desktop/all/ldconfig | 7 +- ublinux/rc.desktop/all/pulseaudio | 7 +- ublinux/rc.desktop/all/qtox | 7 +- ublinux/rc.desktop/all/rfkill | 7 +- ublinux/rc.desktop/all/ublinuxupdate | 7 +- ublinux/rc.desktop/all/xbindkeys | 7 +- ublinux/rc.desktop/deonly/cryptkeeper | 6 +- .../deonly/gnome-network-proxy-system | 7 +- .../rc.desktop/deonly/i3-notification-daemon | 6 +- ublinux/rc.desktop/deonly/plank | 7 +- ublinux/rc.desktop/deonly/trolltech | 7 + .../deonly/xfce4-placeondesktop-trust | 7 +- .../rc.desktop/deonly/xfce4-screensaver-fix | 7 +- ublinux/rc.desktop/deonly/xfce4-xfconf | 7 +- ublinux/rc.domain.d/30-usershwaccess | 7 +- ublinux/rc.halt.pre/01-system | 7 + ublinux/rc.halt.pre/02-sysrq-sleepshutdown | 6 +- ublinux/rc.halt.pre/10-shutdown | 8 +- ublinux/rc.halt.pre/15-cleanup | 7 + ublinux/rc.halt.pre/20-grub | 10 +- ublinux/rc.halt.pre/25-accounts-sync | 10 +- ublinux/rc.halt.pre/70-upgrade | 7 +- ublinux/rc.halt.pre/71-kernel | 7 + ublinux/rc.halt.pre/75-chmod | 7 + ublinux/rc.halt.pre/80-savetomodule | 7 +- ublinux/rc.halt.pre/85-save-cache | 13 +- ublinux/rc.halt.pre/86-save-rootcopy | 10 +- ublinux/rc.halt/20-timesave | 7 +- ublinux/rc.local.d/01-background | 8 +- ublinux/rc.local.d/10-sudoers | 9 +- ublinux/rc.local.d/20-pwgr-check | 8 +- ublinux/rc.local.d/31-sound | 9 +- ublinux/rc.local.d/40-pacman | 7 +- ublinux/rc.local.d/41-x11vnc | 8 +- ublinux/rc.local.d/42-domain_join | 14 +- ublinux/rc.local.d/43-repository | 10 +- ublinux/rc.local.d/50-update-cache-gdk-pixbuf | 7 +- ublinux/rc.local.d/50-update-cache-gtk-icon | 11 +- ublinux/rc.local.d/50-update-desktop-database | 7 +- .../rc.local.d/50-update-glib-compile-schemas | 12 +- ublinux/rc.local.d/50-update-mime | 7 +- ublinux/rc.local.d/51-mozilla_extensions | 19 +- ublinux/rc.local.d/52-consolesetup | 8 +- ublinux/rc.local.d/54-plymouth | 11 +- ublinux/rc.local.d/55-x2go | 10 +- ublinux/rc.local.d/91-cts | 8 +- ublinux/rc.local.d/91-eula | 17 +- ublinux/rc.local.d/98-ubpile | 11 +- ublinux/rc.local.d/99-1c-enterprise | 11 +- ublinux/rc.network.d/10-network | 8 +- ublinux/rc.network.d/81-samba | 9 +- ublinux/rc.network.d/90-ublinuxupdate | 9 +- ublinux/rc.pamsession.d/01-placeondesktop | 7 +- ublinux/rc.pamsession.d/02-journald-notify | 8 +- ublinux/rc.pamsession.d/03-certmonger-cepces | 7 +- ublinux/rc.pamsession.d/04-user-locale | 7 +- ublinux/rc.post.d/01-system | 10 +- ublinux/rc.post.d/02-hwclock | 14 +- ublinux/rc.post.d/03-modprobepreload | 14 +- ublinux/rc.post.d/09-automount | 8 +- ublinux/rc.post.d/10-brand-backgrounds | 8 +- ublinux/rc.post.d/11-xorg | 8 +- ublinux/rc.post.d/12-dm-background | 8 +- ublinux/rc.post.d/13-dconf | 8 +- ublinux/rc.post.d/16-kiosk-desktop | 12 +- ublinux/rc.post.d/17-kiosk-gtk | 8 +- ublinux/rc.post.d/18-kiosk-xfce4-kioskrc | 24 +-- ublinux/rc.post.d/20-initrd | 16 +- ublinux/rc.post.d/23-publicdir | 8 +- ublinux/rc.post.d/24-samba-usershares | 8 +- ublinux/rc.post.d/30-network | 8 +- ublinux/rc.post.d/35-soundprofile | 8 +- ublinux/rc.post.d/42-access-suid-sgid | 8 +- ublinux/rc.post.d/43-access-exec | 8 +- ublinux/rc.post.d/44-mountattr | 8 +- ublinux/rc.post.d/45-disk-quota | 8 +- ublinux/rc.post.d/46-cgroup-quota | 8 +- ublinux/rc.post.d/50-update-fonts | 10 +- ublinux/rc.post.d/51-theme | 8 +- ublinux/rc.post.d/60-blacklistdkms | 8 +- ublinux/rc.post/01-system | 9 +- ublinux/rc.post/10-ldconfig | 10 +- ublinux/rc.post/20-plymouth | 8 +- ublinux/rc.post/30-selinux | 8 +- ublinux/rc.preinit.d/01-depmod | 6 +- ublinux/rc.preinit.d/02-modulespreload | 11 +- ublinux/rc.preinit.d/03-ldconfig | 6 +- ublinux/rc.preinit.d/04-update-fonts | 6 +- ublinux/rc.preinit.d/10-system | 6 +- ublinux/rc.preinit.d/11-partitions | 10 +- ublinux/rc.preinit.d/12-save2module | 8 +- ublinux/rc.preinit.d/13-release | 6 +- ublinux/rc.preinit.d/20-services | 6 +- ublinux/rc.preinit.d/21-ntp | 6 +- ublinux/rc.preinit.d/22-samba | 6 +- ublinux/rc.preinit.d/23-realmd | 6 +- ublinux/rc.preinit.d/24-logging | 6 +- ublinux/rc.preinit.d/30-network-hostname | 6 +- ublinux/rc.preinit.d/31-network-proxy-system | 6 +- ublinux/rc.preinit.d/32-network | 6 +- ublinux/rc.preinit.d/35-iptables | 6 +- ublinux/rc.preinit.d/36-ufw | 6 +- ublinux/rc.preinit.d/40-authpam | 6 +- ublinux/rc.preinit.d/50-xorg | 6 +- ublinux/rc.preinit.d/50-xorg-old | 11 +- ublinux/rc.preinit.d/51-autologin | 6 +- ublinux/rc.preinit.d/52-desktop | 6 +- ublinux/rc.preinit.d/53-language | 6 +- ublinux/rc.preinit.d/54-backgrounds | 6 +- ublinux/rc.preinit.d/55-multiseat | 6 +- ublinux/rc.preinit.d/56-openssl-engine | 6 +- ublinux/rc.preinit.d/57-access-denied-vtx11 | 8 +- ublinux/rc.preinit.d/58-access-login | 6 +- ublinux/rc.preinit.d/59-polkit | 6 +- ublinux/rc.preinit.d/60-lightdm-settings | 6 +- ublinux/rc.preinit.d/63-xorg-dpi | 6 +- ublinux/rc.preinit.d/64-swapspace | 7 +- ublinux/rc.preinit.d/65-kesl | 6 +- ublinux/rc.preinit.d/70-virtualbox | 8 +- ublinux/rc.preinit.d/71-vmware | 8 +- ublinux/rc.preinit.d/72-hyperv | 26 +-- ublinux/rc.preinit.d/73-qemu | 8 +- ublinux/rc.preinit.d/80-server-storage | 6 +- ublinux/rc.preinit.d/90-apparmor | 6 +- ublinux/rc.preinit.d/99-osinstall | 6 +- ublinux/rc.preinit/01-inifile | 6 +- ublinux/rc.preinit/02-skel-adds | 6 +- ublinux/rc.preinit/03-initvars | 7 +- ublinux/rc.preinit/05-save-clean | 6 +- ublinux/rc.preinit/06-statemode | 6 +- ublinux/rc.preinit/08-prettyname | 6 +- ublinux/rc.preinit/10-accounts | 9 +- ublinux/rc.preinit/20-remount | 6 +- ublinux/rc.preinit/50-install-pkg | 9 +- ublinux/rc.profile/00-envvars | 1 + ublinux/rc.profile/01-de-background | 74 +++---- ublinux/rc.profile/02-xrandr | 110 +++++----- ublinux/rc.profile/03-profile-locale | 1 - ublinux/rc.profile/10-fixkeyboard_layout | 27 +-- ublinux/rc.profile/20-video-xorg-dpi | 198 +++++++++--------- ublinux/rc.profile/50-domain_join | 65 +++--- ublinux/rc.profile/90-secretnet | 23 +- ublinux/scripts/grub-functions | 2 - 160 files changed, 1042 insertions(+), 756 deletions(-) diff --git a/ublinux/functions b/ublinux/functions index b0a2e98..4c9898f 100755 --- a/ublinux/functions +++ b/ublinux/functions @@ -582,13 +582,25 @@ log(){ debug_mode(){ if [[ $(cmdline_parameter debug) || ${DEBUGMODE} == "yes" ]]; then - [[ -n ${SELF_FILE} && -n ${SELF_NAME} ]] || { local SELF_FILE=$0; local SELF_NAME=${0##*/}; } [[ ${PWD} == "/union" ]] && local ROOTFS="." || local ROOTFS= - if [[ ! -f ${ROOTFS}/var/log/ublinux/${SELF_NAME}.log ]]; then + local PATH_LOG="${ROOTFS}/var/log/ublinux" + [[ -z ${ROOTFS} && ${EUID:-0} -ne 0 ]] && PATH_LOG="${HOME}/.ublinux/log" + [[ -d ${PATH_LOG} ]] || mkdir -p "${PATH_LOG}" + if [[ -z ${SELF_FILE} && -n $1 && -e $1 ]]; then + SELF_FILE=$1 && SELF_NAME=${1##*/} && SELF_PATH=${1%/*} + elif [[ -z ${SELF_FILE} && -n ${SSC_ARGV0} && -e ${SSC_ARGV0} ]]; then + SELF_FILE=${SSC_ARGV0} && SELF_NAME=${SSC_ARGV0##*/} && SELF_PATH=${SSC_ARGV0%/*} + elif [[ -z ${SELF_FILE} && -n $0 && -e $0 && ! $0 =~ ^"/dev/".* ]]; then + SELF_FILE=${0} && SELF_NAME=${0##*/} && SELF_PATH=${0%/*} + else + SELF_FILE="unknown" && SELF_NAME="unknown" && SELF_PATH="unknown" + echo "$0 $@" >> "${PATH_LOG}/${SELF_NAME}.log" + fi + if [[ ! -f "${PATH_LOG}/${SELF_NAME}.log" ]]; then echo "${SELF_NAME} -- debug mode enabled" - [[ -d ${ROOTFS}/var/log/ublinux ]] || mkdir -p ${ROOTFS}/var/log/ublinux - echo $(date) > ${ROOTFS}/var/log/ublinux/${SELF_NAME}.log || echo "ERROR: Can not create log file" - ${SELF_FILE} "$@" 2>&1 | tee -a ${ROOTFS}/var/log/ublinux/${SELF_NAME}.log + echo $(date) > "${PATH_LOG}/${SELF_NAME}.log" || echo "ERROR: Can not create log file" + shift + ${SELF_FILE} "$@" 2>&1 | tee -a "${PATH_LOG}/${SELF_NAME}.log" exit 0 fi fi @@ -1072,8 +1084,9 @@ ubconfig_exec_system(){ [[ -d ${SSC_EXTRACT_DIR} ]] && rm -rf "${SSC_EXTRACT_DIR}" [[ -n ${SSC_ARGV0} ]] && { [[ -f /usr/bin/bash ]] && /usr/bin/bash --version | grep -q ^"GNU bash" || exit 1; } [[ -z ${SELF_FILE} ]] && [[ -n ${SSC_ARGV0} ]] && SELF_FILE=${SSC_ARGV0} && SELF_NAME=${SSC_ARGV0##*/} && SELF_PATH=${SSC_ARGV0%/*} || { SELF_FILE=${0} && SELF_NAME=${0##*/} && SELF_PATH=${0%/*}; } + [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } - SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 + SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" #export TEXTDOMAINDIR="${ROOTFS}/usr/share/locale" diff --git a/ublinux/rc.d/rc.desktop b/ublinux/rc.d/rc.desktop index 79c1a3d..f0be256 100755 --- a/ublinux/rc.d/rc.desktop +++ b/ublinux/rc.d/rc.desktop @@ -9,20 +9,24 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null DE=$(get_de) cd "${HOME}" - PATH_FIND="/usr/lib/ublinux/rc.desktop/${DE}" + PATH_FIND="${ROOTFS}/usr/lib/ublinux/rc.desktop/${DE}" while IFS= LC_ALL=C read -ru3 -d '' SELECT_FILE; do ${SELECT_FILE} 2>/dev/null & done 3< <(find "${PATH_FIND}" -type f -executable -print0 | sort -Vz) RC_DESKTOP_NOEXEC=${RC_DESKTOP_NOEXEC//,/ }; RC_DESKTOP_NOEXEC=${RC_DESKTOP_NOEXEC//;/ } - PATH_FIND="/usr/lib/ublinux/rc.desktop/all" + PATH_FIND="${ROOTFS}/usr/lib/ublinux/rc.desktop/all" while IFS= LC_ALL=C read -ru3 -d '' SELECT_FILE; do [[ ${RC_DESKTOP_NOEXEC} =~ (^| |/)"${SELECT_FILE##*/}"( |$) ]] && continue [[ ${RC_DESKTOP_NOEXEC} =~ (^| |/)"${DE}:${SELECT_FILE##*/}"( |$) ]] && continue @@ -30,6 +34,6 @@ SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null ${SELECT_FILE} & done 3< <(find "${PATH_FIND}" -type f -executable -print0 | sort -Vz) - echo 1 > /run/ublinux_started + echo 1 > ${ROOTFS}/run/ublinux_started true diff --git a/ublinux/rc.d/rc.halt b/ublinux/rc.d/rc.halt index 65b9f4d..98eb8f7 100755 --- a/ublinux/rc.d/rc.halt +++ b/ublinux/rc.d/rc.halt @@ -9,7 +9,14 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } - PATH_FIND="/usr/lib/ublinux/rc.halt" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" + + PATH_FIND="${ROOTFS}/usr/lib/ublinux/rc.halt" while IFS= LC_ALL=C read -ru3 -d '' SELECT_FILE; do ${SELECT_FILE} 2>/dev/null done 3< <(find "${PATH_FIND}" -type f -executable -print0 | sort -Vz) diff --git a/ublinux/rc.d/rc.halt.pre b/ublinux/rc.d/rc.halt.pre index 0e820c0..6d8107c 100755 --- a/ublinux/rc.d/rc.halt.pre +++ b/ublinux/rc.d/rc.halt.pre @@ -9,7 +9,14 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } - PATH_FIND="/usr/lib/ublinux/rc.halt.pre" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" + + PATH_FIND="${ROOTFS}/usr/lib/ublinux/rc.halt.pre" while IFS= LC_ALL=C read -ru3 -d '' SELECT_FILE; do ${SELECT_FILE} 2>/dev/null done 3< <(find "${PATH_FIND}" -type f -executable -print0 | sort -Vz) diff --git a/ublinux/rc.d/rc.local b/ublinux/rc.d/rc.local index 96d5b2f..3eaa96d 100755 --- a/ublinux/rc.d/rc.local +++ b/ublinux/rc.d/rc.local @@ -10,19 +10,21 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -debug_mode "$0" "$@" +SYSCONF="${ROOTFS}${SYSCONF}" +SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null - PATH_FIND="/usr/lib/ublinux/rc.local.d" + PATH_FIND="${ROOTFS}/usr/lib/ublinux/rc.local.d" while IFS= LC_ALL=C read -ru3 -d '' SELECT_FILE; do ${SELECT_FILE} 2>/dev/null & done 3< <(find "${PATH_FIND}" -type f -executable -print0 | sort -Vz) - echo -ne > /run/ublinux_started - chmod 664 /run/ublinux_started - chgrp users /run/ublinux_started + echo -ne > ${ROOTFS}/run/ublinux_started + chmod 664 ${ROOTFS}/run/ublinux_started + chgrp users ${ROOTFS}/run/ublinux_started true diff --git a/ublinux/rc.d/rc.network b/ublinux/rc.d/rc.network index e1cbc8c..b4cb7fa 100755 --- a/ublinux/rc.d/rc.network +++ b/ublinux/rc.d/rc.network @@ -10,13 +10,15 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -debug_mode "$0" "$@" +SYSCONF="${ROOTFS}${SYSCONF}" +SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null - PATH_FIND="/usr/lib/ublinux/rc.network.d" + PATH_FIND="${ROOTFS}/usr/lib/ublinux/rc.network.d" while IFS= LC_ALL=C read -ru3 -d '' SELECT_FILE; do #${SELECT_FILE} 2>/dev/null & ${SELECT_FILE} & diff --git a/ublinux/rc.d/rc.pamaccount b/ublinux/rc.d/rc.pamaccount index f4f2c29..07f339d 100755 --- a/ublinux/rc.d/rc.pamaccount +++ b/ublinux/rc.d/rc.pamaccount @@ -9,11 +9,15 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null - PATH_FIND="/usr/lib/ublinux/rc.pamaccount.d" + PATH_FIND="${ROOTFS}/usr/lib/ublinux/rc.pamaccount.d" while IFS= LC_ALL=C read -ru3 -d '' SELECT_FILE; do #${SELECT_FILE} 2>/dev/null & ${SELECT_FILE} & diff --git a/ublinux/rc.d/rc.pamauth b/ublinux/rc.d/rc.pamauth index 2f8a7c9..a6aeccb 100755 --- a/ublinux/rc.d/rc.pamauth +++ b/ublinux/rc.d/rc.pamauth @@ -9,11 +9,15 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null - PATH_FIND="/usr/lib/ublinux/rc.pamauth.d" + PATH_FIND="${ROOTFS}/usr/lib/ublinux/rc.pamauth.d" while IFS= LC_ALL=C read -ru3 -d '' SELECT_FILE; do #${SELECT_FILE} 2>/dev/null & ${SELECT_FILE} & diff --git a/ublinux/rc.d/rc.pampassword b/ublinux/rc.d/rc.pampassword index a450864..a354d0b 100755 --- a/ublinux/rc.d/rc.pampassword +++ b/ublinux/rc.d/rc.pampassword @@ -9,11 +9,15 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null - PATH_FIND="/usr/lib/ublinux/rc.pampassword.d" + PATH_FIND="${ROOTFS}/usr/lib/ublinux/rc.pampassword.d" while IFS= LC_ALL=C read -ru3 -d '' SELECT_FILE; do #${SELECT_FILE} 2>/dev/null & ${SELECT_FILE} & diff --git a/ublinux/rc.d/rc.pamsession b/ublinux/rc.d/rc.pamsession index 06f2ce4..dc78781 100755 --- a/ublinux/rc.d/rc.pamsession +++ b/ublinux/rc.d/rc.pamsession @@ -9,11 +9,15 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null - PATH_FIND="/usr/lib/ublinux/rc.pamsession.d" + PATH_FIND="${ROOTFS}/usr/lib/ublinux/rc.pamsession.d" while IFS= LC_ALL=C read -ru3 -d '' SELECT_FILE; do #${SELECT_FILE} 2>/dev/null & ${SELECT_FILE} & diff --git a/ublinux/rc.d/rc.post b/ublinux/rc.d/rc.post index 3bbac98..38684e0 100755 --- a/ublinux/rc.d/rc.post +++ b/ublinux/rc.d/rc.post @@ -9,22 +9,27 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -debug_mode "$0" "$@" - PATH_FIND="/usr/lib/ublinux/rc.post.d" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" + + PATH_FIND="${ROOTFS}/usr/lib/ublinux/rc.post.d" while IFS= LC_ALL=C read -ru3 -d '' SELECT_FILE; do ${SELECT_FILE} 2>/dev/null & done 3< <(find "${PATH_FIND}" -type f -executable -print0 | sort -Vz) - PATH_FIND="/usr/lib/ublinux/rc.post" + PATH_FIND="${ROOTFS}/usr/lib/ublinux/rc.post" while IFS= LC_ALL=C read -ru3 -d '' SELECT_FILE; do ${SELECT_FILE} 2>/dev/null done 3< <(find "${PATH_FIND}" -type f -executable -print0 | sort -Vz) # We have to launch some rc scripts from external modules - PATH_FIND="/usr/lib/ublinux/rc.runonce" - LOCKDIR="/var/lock/ublinux/rc.runonce" + PATH_FIND="${ROOTFS}/usr/lib/ublinux/rc.runonce" + LOCKDIR="${ROOTFS}/var/lock/ublinux/rc.runonce" [[ -d ${LOCKDIR} ]] || install -dm0700 "${LOCKDIR}" while IFS= LC_ALL=C read -ru3 -d '' SELECT_FILE; do [[ -f "${LOCKDIR}/${SELECT_FILE##*/}" ]] && continue diff --git a/ublinux/rc.d/rc.preinit b/ublinux/rc.d/rc.preinit index 7c76a77..0a2c24d 100755 --- a/ublinux/rc.d/rc.preinit +++ b/ublinux/rc.d/rc.preinit @@ -13,8 +13,12 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE="/liblinuxlive" && [[ -r ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || SOURCE="/mnt/live/liblinuxlive" && [[ -r ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -debug_mode "$0" "$@" debug_log "Starting rc.preinit" debug_shell diff --git a/ublinux/rc.d/rc.profile b/ublinux/rc.d/rc.profile index d821967..890d53e 100755 --- a/ublinux/rc.d/rc.profile +++ b/ublinux/rc.d/rc.profile @@ -8,10 +8,17 @@ ENABLED=yes -if [[ ${ENABLED} == "yes" ]]; then - PATH_FIND="/usr/lib/ublinux/rc.profile" - while IFS= LC_ALL=C read -ru3 -d '' SELECT_FILE; do - ${SELECT_FILE} 2>/dev/null - done 3< <(find "${PATH_FIND}" -type f -executable -print0 | sort -Vz) -fi -true +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" + + if [[ ${ENABLED} == "yes" ]]; then + PATH_FIND="${ROOTFS}/usr/lib/ublinux/rc.profile" + while IFS= LC_ALL=C read -ru3 -d '' SELECT_FILE; do + ${SELECT_FILE} 2>/dev/null + done 3< <(find "${PATH_FIND}" -type f -executable -print0 | sort -Vz) + fi + true diff --git a/ublinux/rc.desktop/all/autoexec b/ublinux/rc.desktop/all/autoexec index ed49179..a30727e 100755 --- a/ublinux/rc.desktop/all/autoexec +++ b/ublinux/rc.desktop/all/autoexec @@ -9,9 +9,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -. /usr/lib/ublinux/functions -. /usr/lib/ublinux/default +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/desktop; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.desktop/all/bookmarks b/ublinux/rc.desktop/all/bookmarks index b6b3c30..2a3e343 100755 --- a/ublinux/rc.desktop/all/bookmarks +++ b/ublinux/rc.desktop/all/bookmarks @@ -9,8 +9,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -. /usr/lib/ublinux/default +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null add_bookmarks(){ diff --git a/ublinux/rc.desktop/all/chromium b/ublinux/rc.desktop/all/chromium index cfd836c..bced4c7 100755 --- a/ublinux/rc.desktop/all/chromium +++ b/ublinux/rc.desktop/all/chromium @@ -9,6 +9,13 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" + rm -f ~/snap/chromium/common/chromium/Singleton* \ ~/.config/chromium/Singleton* \ ~/.config/google-chrome/Singleton* \ No newline at end of file diff --git a/ublinux/rc.desktop/all/fusion-icon b/ublinux/rc.desktop/all/fusion-icon index c2c1f84..d273e6f 100755 --- a/ublinux/rc.desktop/all/fusion-icon +++ b/ublinux/rc.desktop/all/fusion-icon @@ -9,9 +9,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -. /usr/lib/ublinux/functions -. /usr/lib/ublinux/default +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null DE=$(get_de) diff --git a/ublinux/rc.desktop/all/ldconfig b/ublinux/rc.desktop/all/ldconfig index 657fde7..a693789 100755 --- a/ublinux/rc.desktop/all/ldconfig +++ b/ublinux/rc.desktop/all/ldconfig @@ -8,8 +8,13 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -. /usr/lib/ublinux/default +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null [[ ${RUNLDCONFIG} != "yes" && ${RUNLDCONFIG} != "no" ]] && setsid bash -c "sleep 30 && sudo /usr/bin/ldconfig" & diff --git a/ublinux/rc.desktop/all/pulseaudio b/ublinux/rc.desktop/all/pulseaudio index 73d0bf8..de6cda0 100755 --- a/ublinux/rc.desktop/all/pulseaudio +++ b/ublinux/rc.desktop/all/pulseaudio @@ -9,9 +9,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -. /usr/lib/ublinux/functions -. /usr/lib/ublinux/default +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/hardware; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.desktop/all/qtox b/ublinux/rc.desktop/all/qtox index 99b4b64..548683d 100755 --- a/ublinux/rc.desktop/all/qtox +++ b/ublinux/rc.desktop/all/qtox @@ -11,9 +11,12 @@ ENABLED=yes [[ -f ${HOME}/.config/tox/qtox.ini ]] && exit 0 -. /usr/lib/ublinux/functions -. /usr/lib/ublinux/default +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null TOX_LANG=$(cmdline_value lang) diff --git a/ublinux/rc.desktop/all/rfkill b/ublinux/rc.desktop/all/rfkill index f6b09d5..a244405 100755 --- a/ublinux/rc.desktop/all/rfkill +++ b/ublinux/rc.desktop/all/rfkill @@ -9,6 +9,11 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -. /usr/lib/ublinux/functions +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" [[ -n $(cmdline_parameter flightmode) ]] && rfkill block all diff --git a/ublinux/rc.desktop/all/ublinuxupdate b/ublinux/rc.desktop/all/ublinuxupdate index c83fa04..1cbbdc1 100755 --- a/ublinux/rc.desktop/all/ublinuxupdate +++ b/ublinux/rc.desktop/all/ublinuxupdate @@ -9,8 +9,11 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -. /usr/lib/ublinux/functions -. /usr/lib/ublinux/default +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/update; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.desktop/all/xbindkeys b/ublinux/rc.desktop/all/xbindkeys index c49f536..867e9ba 100755 --- a/ublinux/rc.desktop/all/xbindkeys +++ b/ublinux/rc.desktop/all/xbindkeys @@ -9,6 +9,11 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -. /usr/lib/ublinux/default +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" [[ ${XBINDKEYS_START} == "yes" ]] && xbindkeys ${XBINDKEYS_OPTIONS} & diff --git a/ublinux/rc.desktop/deonly/cryptkeeper b/ublinux/rc.desktop/deonly/cryptkeeper index d71af7f..746384e 100755 --- a/ublinux/rc.desktop/deonly/cryptkeeper +++ b/ublinux/rc.desktop/deonly/cryptkeeper @@ -11,8 +11,12 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -. /usr/lib/ublinux/default +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null which cryptkeeper >/dev/null 2>&1 || exit 0 diff --git a/ublinux/rc.desktop/deonly/gnome-network-proxy-system b/ublinux/rc.desktop/deonly/gnome-network-proxy-system index b5d873e..42b1fce 100755 --- a/ublinux/rc.desktop/deonly/gnome-network-proxy-system +++ b/ublinux/rc.desktop/deonly/gnome-network-proxy-system @@ -9,9 +9,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.desktop/deonly/i3-notification-daemon b/ublinux/rc.desktop/deonly/i3-notification-daemon index dd35cce..f609cf3 100755 --- a/ublinux/rc.desktop/deonly/i3-notification-daemon +++ b/ublinux/rc.desktop/deonly/i3-notification-daemon @@ -11,8 +11,12 @@ ENABLED=no I3_NOTIFYD="yes" -. /usr/lib/ublinux/default +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null [[ ${I3_NOTIFYD} != "no" ]] && [[ -f /usr/share/applications/notification-daemon.desktop ]] && dex /usr/share/applications/notification-daemon.desktop & diff --git a/ublinux/rc.desktop/deonly/plank b/ublinux/rc.desktop/deonly/plank index a622f12..9dcc6f8 100755 --- a/ublinux/rc.desktop/deonly/plank +++ b/ublinux/rc.desktop/deonly/plank @@ -9,7 +9,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null [[ -n ${SSC_ARGV0} ]] && SELF_FILE=${SSC_ARGV0} && SELF_NAME=${SSC_ARGV0##*/} && SELF_PATH=${SSC_ARGV0%/*} || { SELF_FILE=${0} && SELF_NAME=${0##*/} && SELF_PATH=${0%/*}; } diff --git a/ublinux/rc.desktop/deonly/trolltech b/ublinux/rc.desktop/deonly/trolltech index a62237e..a5ad8ce 100755 --- a/ublinux/rc.desktop/deonly/trolltech +++ b/ublinux/rc.desktop/deonly/trolltech @@ -9,4 +9,11 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" + [[ ! -f ${HOME}/.config/Trolltech.conf && -f /usr/share/lxqt/themes/Default/Trolltech.conf ]] && cp /usr/share/lxqt/themes/Default/Trolltech.conf ${HOME}/.config/Trolltech.conf diff --git a/ublinux/rc.desktop/deonly/xfce4-placeondesktop-trust b/ublinux/rc.desktop/deonly/xfce4-placeondesktop-trust index 3ea5c27..1f2b8f2 100755 --- a/ublinux/rc.desktop/deonly/xfce4-placeondesktop-trust +++ b/ublinux/rc.desktop/deonly/xfce4-placeondesktop-trust @@ -12,9 +12,12 @@ shopt -s extglob ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/kiosk; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.desktop/deonly/xfce4-screensaver-fix b/ublinux/rc.desktop/deonly/xfce4-screensaver-fix index 0acd2ec..c1c350d 100755 --- a/ublinux/rc.desktop/deonly/xfce4-screensaver-fix +++ b/ublinux/rc.desktop/deonly/xfce4-screensaver-fix @@ -9,7 +9,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -#. /etc/ublinux/config +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" # Если не загружен ни один драйвер видео KMS, то xfce4-screensaver закрываем, т.к. не правильно отрабатывает блокировка diff --git a/ublinux/rc.desktop/deonly/xfce4-xfconf b/ublinux/rc.desktop/deonly/xfce4-xfconf index 248adca..9b0444e 100755 --- a/ublinux/rc.desktop/deonly/xfce4-xfconf +++ b/ublinux/rc.desktop/deonly/xfce4-xfconf @@ -9,7 +9,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/kiosk; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.domain.d/30-usershwaccess b/ublinux/rc.domain.d/30-usershwaccess index 49904b6..3502013 100755 --- a/ublinux/rc.domain.d/30-usershwaccess +++ b/ublinux/rc.domain.d/30-usershwaccess @@ -9,7 +9,12 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null [[ -n ${DOMAIN_USERGROUPS} ]] && { DOMAIN_USERGROUPS=${DOMAIN_USERGROUPS//,/ }; DOMAIN_USERGROUPS=${DOMAIN_USERGROUPS//;/ }; } || exit 0 diff --git a/ublinux/rc.halt.pre/01-system b/ublinux/rc.halt.pre/01-system index 32299e7..a276559 100755 --- a/ublinux/rc.halt.pre/01-system +++ b/ublinux/rc.halt.pre/01-system @@ -9,6 +9,13 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" + exec_fsmount(){ # If installed on [ntfsmount|rpciod|nfsiod|httpfs|curlftpfs] we have to omit killing rootfilesystem mounter when system halt #ps | grep -E 'ntfsmount|rpciod|nfsiod|httpfs|curlftpfs' | awk '{ print $1 }' >> ${ROOTFS}/var/run/sendsigs.omit diff --git a/ublinux/rc.halt.pre/02-sysrq-sleepshutdown b/ublinux/rc.halt.pre/02-sysrq-sleepshutdown index 5239d04..2e814c6 100755 --- a/ublinux/rc.halt.pre/02-sysrq-sleepshutdown +++ b/ublinux/rc.halt.pre/02-sysrq-sleepshutdown @@ -9,8 +9,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.halt.pre/10-shutdown b/ublinux/rc.halt.pre/10-shutdown index f640d72..3b42ebf 100755 --- a/ublinux/rc.halt.pre/10-shutdown +++ b/ublinux/rc.halt.pre/10-shutdown @@ -10,15 +10,15 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } PATH=/usr/lib/ublinux/scripts:$PATH - #HALT_PROCESSES_KILL="slim kdm X lxdm xdm sddm cupsd pdnsd mc mandb" HALT_PROCESSES_KILL="" HALT_SERVICES_STOP="" HALT_EXCLUDE_STOP="" -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.halt.pre/15-cleanup b/ublinux/rc.halt.pre/15-cleanup index caf7d12..6b0b3bf 100755 --- a/ublinux/rc.halt.pre/15-cleanup +++ b/ublinux/rc.halt.pre/15-cleanup @@ -9,6 +9,13 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" + # some cleanups # rm -fr /tmp/* /mnt/live/memory/changes/usr/share/apps/ksplash/Themes/Default 2>/dev/null # rm -f /usr/share/ublinux/wallpapers/default*.jpg 2>/dev/null diff --git a/ublinux/rc.halt.pre/20-grub b/ublinux/rc.halt.pre/20-grub index 9ae2f56..7792fec 100755 --- a/ublinux/rc.halt.pre/20-grub +++ b/ublinux/rc.halt.pre/20-grub @@ -8,12 +8,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -#DEBUGMODE=no +DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -#debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.halt.pre/25-accounts-sync b/ublinux/rc.halt.pre/25-accounts-sync index f95492b..9718a33 100755 --- a/ublinux/rc.halt.pre/25-accounts-sync +++ b/ublinux/rc.halt.pre/25-accounts-sync @@ -10,12 +10,12 @@ shopt -s extglob ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -#DEBUGMODE=no +DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -#debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.halt.pre/70-upgrade b/ublinux/rc.halt.pre/70-upgrade index c1ec0b0..b2d9c72 100755 --- a/ublinux/rc.halt.pre/70-upgrade +++ b/ublinux/rc.halt.pre/70-upgrade @@ -10,9 +10,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } #grep -q 1 /run/ublinux_started || exit 0 -#. /usr/lib/ublinux/functions -#. /usr/lib/ublinux/default +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +#SYSCONF="${ROOTFS}${SYSCONF}" #SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null EXT="ubm" diff --git a/ublinux/rc.halt.pre/71-kernel b/ublinux/rc.halt.pre/71-kernel index 2e6f3b3..7d6621e 100755 --- a/ublinux/rc.halt.pre/71-kernel +++ b/ublinux/rc.halt.pre/71-kernel @@ -9,6 +9,13 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" + PATH_BOOT="/memory/layer-base/0" PATH_KERNEL="/usr/lib/modules" diff --git a/ublinux/rc.halt.pre/75-chmod b/ublinux/rc.halt.pre/75-chmod index 91c68a8..c8bc35b 100755 --- a/ublinux/rc.halt.pre/75-chmod +++ b/ublinux/rc.halt.pre/75-chmod @@ -9,6 +9,13 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" + chmod_ublinux() { local PATH_UBLINUX=$1 if [[ -w ${PATH_UBLINUX} ]]; then diff --git a/ublinux/rc.halt.pre/80-savetomodule b/ublinux/rc.halt.pre/80-savetomodule index c542dba..8a36b7b 100755 --- a/ublinux/rc.halt.pre/80-savetomodule +++ b/ublinux/rc.halt.pre/80-savetomodule @@ -10,9 +10,12 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } #grep -q 1 /run/ublinux_started || exit 0 -. /usr/lib/ublinux/functions -. /usr/lib/ublinux/default +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/system; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.halt.pre/85-save-cache b/ublinux/rc.halt.pre/85-save-cache index 5041d29..ba3c5a3 100755 --- a/ublinux/rc.halt.pre/85-save-cache +++ b/ublinux/rc.halt.pre/85-save-cache @@ -8,21 +8,18 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -#DEBUGMODE=no +DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -#debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" - -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/save; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null - exec_save_all_cache(){ if [[ -n ${SAVE_ALL_CACHE} ]]; then PATH_CHANGES="/memory/changes" diff --git a/ublinux/rc.halt.pre/86-save-rootcopy b/ublinux/rc.halt.pre/86-save-rootcopy index 62a81ad..632ea96 100755 --- a/ublinux/rc.halt.pre/86-save-rootcopy +++ b/ublinux/rc.halt.pre/86-save-rootcopy @@ -8,12 +8,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -#DEBUGMODE=no +DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -#debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.halt/20-timesave b/ublinux/rc.halt/20-timesave index 65587be..8b5fa59 100755 --- a/ublinux/rc.halt/20-timesave +++ b/ublinux/rc.halt/20-timesave @@ -9,7 +9,12 @@ ENABLED=yes [[ ${ENABLED} != "yes" ]] && exit 0 -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/clock; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null [[ ${HALTSAVETIME,,} =~ ^no$|^off$|^disable$ ]] && exit 0 diff --git a/ublinux/rc.local.d/01-background b/ublinux/rc.local.d/01-background index 01c9ad9..d28e28d 100755 --- a/ublinux/rc.local.d/01-background +++ b/ublinux/rc.local.d/01-background @@ -10,9 +10,11 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -. /usr/lib/ublinux/functions -. /usr/lib/ublinux/default -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/theme; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.local.d/10-sudoers b/ublinux/rc.local.d/10-sudoers index d52cf74..b4a5519 100755 --- a/ublinux/rc.local.d/10-sudoers +++ b/ublinux/rc.local.d/10-sudoers @@ -11,13 +11,14 @@ ENABLED=yes DEBUGMODE=no PATH="/usr/lib/ublinux/scripts:/usr/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin" - ALLOWED_SUDO="ldconfig,ubupdate,ntpdate" -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null FILE_UBWHEEL="/etc/sudoers.d/ubwheel" diff --git a/ublinux/rc.local.d/20-pwgr-check b/ublinux/rc.local.d/20-pwgr-check index c3d5d44..d163790 100755 --- a/ublinux/rc.local.d/20-pwgr-check +++ b/ublinux/rc.local.d/20-pwgr-check @@ -10,10 +10,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -. /usr/lib/ublinux/functions -. /usr/lib/ublinux/default -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null # Проверка файлов на ошибки /etc/passwd /etc/shadow /etc/group /etc/gshadow diff --git a/ublinux/rc.local.d/31-sound b/ublinux/rc.local.d/31-sound index c8e037f..f3f6dc9 100755 --- a/ublinux/rc.local.d/31-sound +++ b/ublinux/rc.local.d/31-sound @@ -4,11 +4,12 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/hardware; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.local.d/40-pacman b/ublinux/rc.local.d/40-pacman index e864411..fbad953 100755 --- a/ublinux/rc.local.d/40-pacman +++ b/ublinux/rc.local.d/40-pacman @@ -10,9 +10,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -debug_mode "$0" "$@" +#SYSCONF="${ROOTFS}${SYSCONF}" exec_01_init_pacman_gpg(){ /usr/bin/pacman-key -l &>/dev/null 2>&1 || rm -rf /etc/pacman.d/gnupg diff --git a/ublinux/rc.local.d/41-x11vnc b/ublinux/rc.local.d/41-x11vnc index 60d01aa..6f82f5a 100755 --- a/ublinux/rc.local.d/41-x11vnc +++ b/ublinux/rc.local.d/41-x11vnc @@ -10,10 +10,12 @@ ENABLED=yes [[ ${ENABLED} == yes ]] || exit 0 DEBUGMODE=no -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/desktop; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.local.d/42-domain_join b/ublinux/rc.local.d/42-domain_join index 1644a1f..c90ef4d 100755 --- a/ublinux/rc.local.d/42-domain_join +++ b/ublinux/rc.local.d/42-domain_join @@ -10,14 +10,16 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=${SYSCONF}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +LOG_UBDOMAIN="/var/log/ubdomain-client.log" -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -LOG_UBDOMAIN="/var/log/ubdomain-client.log" +SYSCONF="${ROOTFS}${SYSCONF}" +SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SOURCE=${SYSCONF}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null if [[ -n ${DOMAIN} ]]; then ## Указать доменных пользователей AccountsService, что-бы были видны для выбора логина в DM diff --git a/ublinux/rc.local.d/43-repository b/ublinux/rc.local.d/43-repository index 53e1370..1b5d85a 100755 --- a/ublinux/rc.local.d/43-repository +++ b/ublinux/rc.local.d/43-repository @@ -10,13 +10,15 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/update; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -debug_mode "$0" "$@" - ## Настройка подключения репозиториев ## REPOSITORY=disable|enable|only ## *disable # Отключить управление списком репозиториев, по умолчанию diff --git a/ublinux/rc.local.d/50-update-cache-gdk-pixbuf b/ublinux/rc.local.d/50-update-cache-gdk-pixbuf index a5929b9..d7c3b91 100755 --- a/ublinux/rc.local.d/50-update-cache-gdk-pixbuf +++ b/ublinux/rc.local.d/50-update-cache-gdk-pixbuf @@ -10,6 +10,11 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" [[ -d "/usr/lib/gdk-pixbuf-2.0/" ]] && gdk-pixbuf-query-loaders --update-cache diff --git a/ublinux/rc.local.d/50-update-cache-gtk-icon b/ublinux/rc.local.d/50-update-cache-gtk-icon index 58169e0..f6687b2 100755 --- a/ublinux/rc.local.d/50-update-cache-gtk-icon +++ b/ublinux/rc.local.d/50-update-cache-gtk-icon @@ -10,11 +10,14 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -UPDATEGTKICONOPTS="-fit /usr/share/icons/hicolor" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" -. /usr/lib/ublinux/functions -. /usr/lib/ublinux/default -debug_mode "$0" "$@" +UPDATEGTKICONOPTS="-fit /usr/share/icons/hicolor" #[[ ${UPDATE_GTK_ICON_CACHE} != "no" ] && [[ -d "/usr/share/icons/hicolor/" ]] && gtk-update-icon-cache ${UPDATE_GTK_ICON_OPTS} >/dev/null 2>&1 diff --git a/ublinux/rc.local.d/50-update-desktop-database b/ublinux/rc.local.d/50-update-desktop-database index dca5a31..cd37316 100755 --- a/ublinux/rc.local.d/50-update-desktop-database +++ b/ublinux/rc.local.d/50-update-desktop-database @@ -10,7 +10,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" if [[ -d "/usr/share/applications/" || -d "/usr/local/share/applications/" ]]; then UPDATE_FILE="/usr/share/applications/ubhwreport.desktop" && [[ -f ${UPDATE_FILE} ]] && touch ${UPDATE_FILE} diff --git a/ublinux/rc.local.d/50-update-glib-compile-schemas b/ublinux/rc.local.d/50-update-glib-compile-schemas index 439b2d6..4ee1ab3 100755 --- a/ublinux/rc.local.d/50-update-glib-compile-schemas +++ b/ublinux/rc.local.d/50-update-glib-compile-schemas @@ -9,8 +9,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -#. /usr/lib/ublinux/functions -#. /usr/lib/ublinux/default -debug_mode "$0" "$@" -[ -d "/usr/share/glib-2.0/schemas/" ] && glib-compile-schemas /usr/share/glib-2.0/schemas/ +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" + +[[ -d "/usr/share/glib-2.0/schemas/" ]] && glib-compile-schemas /usr/share/glib-2.0/schemas/ diff --git a/ublinux/rc.local.d/50-update-mime b/ublinux/rc.local.d/50-update-mime index 7580655..0e05ddb 100755 --- a/ublinux/rc.local.d/50-update-mime +++ b/ublinux/rc.local.d/50-update-mime @@ -10,6 +10,11 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" [[ -d "/usr/share/mime/" ]] && update-mime-database /usr/share/mime \ No newline at end of file diff --git a/ublinux/rc.local.d/51-mozilla_extensions b/ublinux/rc.local.d/51-mozilla_extensions index b2b0c11..852bb85 100755 --- a/ublinux/rc.local.d/51-mozilla_extensions +++ b/ublinux/rc.local.d/51-mozilla_extensions @@ -4,9 +4,10 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null @@ -14,11 +15,11 @@ SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null # Registering mozilla extentions (firefox and thunderbird) if [[ ${REGISTER_MOZEXT} != @("no"|"none"|"disable") ]]; then for APPLICATION in firefox thunderbird; do - [[ -d /usr/lib/mozilla/${APPLICATION}/extensions ]] && for SELECT_EXT in $(ls -d /usr/lib/mozilla/${APPLICATION}/extensions/*); do - for TARGET_APP in /usr/lib/${APPLICATION}*; do - [[ -d ${TARGET_APP}/extensions ]] && ln -sf ${SELECT_EXT} ${TARGET_APP}/extensions - [[ -d ${TARGET_APP}/browser/extensions ]] && ln -sf ${SELECT_EXT} ${TARGET_APP}/browser/extensions - done - done + [[ -d /usr/lib/mozilla/${APPLICATION}/extensions ]] && for SELECT_EXT in $(ls -d /usr/lib/mozilla/${APPLICATION}/extensions/*); do + for TARGET_APP in /usr/lib/${APPLICATION}*; do + [[ -d ${TARGET_APP}/extensions ]] && ln -sf ${SELECT_EXT} ${TARGET_APP}/extensions + [[ -d ${TARGET_APP}/browser/extensions ]] && ln -sf ${SELECT_EXT} ${TARGET_APP}/browser/extensions + done + done done fi diff --git a/ublinux/rc.local.d/52-consolesetup b/ublinux/rc.local.d/52-consolesetup index 0512b77..7f3abcc 100755 --- a/ublinux/rc.local.d/52-consolesetup +++ b/ublinux/rc.local.d/52-consolesetup @@ -10,14 +10,14 @@ ENABLED=yes [[ ${ENABLED} == yes ]] || exit 0 DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/keyboard; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -debug_mode "$0" "$@" # Установить NUMLOCK только для tty [[ ${NUMLOCK} == @(yes|on|enable) ]] && for tty in /dev/tty[1-8]; do setleds -D +num < ${tty}; done diff --git a/ublinux/rc.local.d/54-plymouth b/ublinux/rc.local.d/54-plymouth index b507e32..836fa4a 100755 --- a/ublinux/rc.local.d/54-plymouth +++ b/ublinux/rc.local.d/54-plymouth @@ -9,10 +9,13 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -. /usr/lib/ublinux/functions -. /usr/lib/ublinux/default -SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null -debug_mode "$0" "$@" + +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" PLYMOUTHTHEME=$(/usr/lib/ubboot/ubdistconv -p 2>/dev/null | tail -1) [[ -n ${PLYMOUTHTHEME} ]] || PLYMOUTHTHEME="ublinux-logo-pulse" diff --git a/ublinux/rc.local.d/55-x2go b/ublinux/rc.local.d/55-x2go index 6f33f83..12e718b 100755 --- a/ublinux/rc.local.d/55-x2go +++ b/ublinux/rc.local.d/55-x2go @@ -9,9 +9,13 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -#. /usr/lib/ublinux/functions -#. /usr/lib/ublinux/default -debug_mode "$0" "$@" + +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" command -v x2godbadmin >/dev/null && x2godbadmin --updatedb diff --git a/ublinux/rc.local.d/91-cts b/ublinux/rc.local.d/91-cts index 83c75ee..b2cb6a2 100755 --- a/ublinux/rc.local.d/91-cts +++ b/ublinux/rc.local.d/91-cts @@ -11,7 +11,13 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -debug_mode "$0" "$@" + +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" ISSYSTEMD=$(readlink -fq ${ROOTFS}/usr/bin/init | grep "lib/systemd/systemd$") if [[ -d /etc/cts ]]; then diff --git a/ublinux/rc.local.d/91-eula b/ublinux/rc.local.d/91-eula index e7870f6..47c547e 100755 --- a/ublinux/rc.local.d/91-eula +++ b/ublinux/rc.local.d/91-eula @@ -8,16 +8,17 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } - -#PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin DEBUGMODE=no -#. usr/lib/ublinux/functions -#. usr/lib/ublinux/default + EULA_DB="/usr/share/ublinux/agreement/EULA_DB.txt" EULA="/usr/share/ublinux/agreement/EULA.txt" -debug_mode "$0" "$@" -#. .$SYSCONF/config 2>/dev/null || . $SYSCONF/config 2>/dev/null +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" -[[ $(cat /usr/lib/os-release | grep "VERSION_CODENAME" | cut -d= -f2) = "ublinux_db" ]] && mv ${EULA_DB} ${EULA} -rm -f ${EULA_DB} \ No newline at end of file + [[ $(cat /usr/lib/os-release | grep "VERSION_CODENAME" | cut -d= -f2) = "ublinux_db" ]] && mv ${EULA_DB} ${EULA} + rm -f ${EULA_DB} \ No newline at end of file diff --git a/ublinux/rc.local.d/98-ubpile b/ublinux/rc.local.d/98-ubpile index 8bf3800..a6cb27c 100755 --- a/ublinux/rc.local.d/98-ubpile +++ b/ublinux/rc.local.d/98-ubpile @@ -10,14 +10,15 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/server; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -debug_mode "$0" "$@" - - if [[ -d "/opt/ubpile" ]]; then APP_UBPILE="ubpile" PATH_UBPILE="/opt/${APP_UBPILE}" diff --git a/ublinux/rc.local.d/99-1c-enterprise b/ublinux/rc.local.d/99-1c-enterprise index b9f4214..2ccaca9 100755 --- a/ublinux/rc.local.d/99-1c-enterprise +++ b/ublinux/rc.local.d/99-1c-enterprise @@ -11,8 +11,13 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -#. /usr/lib/ublinux/functions -#debug_mode "$0" "$@" + +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" #if pacman -Qqs xfce4- >/dev/null ; then echo ok; fi @@ -21,5 +26,3 @@ DEBUGMODE=no # ldconfig /usr/lib/cts && systemctl restart cts # fi #fi - -exit 0 diff --git a/ublinux/rc.network.d/10-network b/ublinux/rc.network.d/10-network index 755a702..094b8e7 100755 --- a/ublinux/rc.network.d/10-network +++ b/ublinux/rc.network.d/10-network @@ -10,10 +10,12 @@ ENABLED=yes [[ ${ENABLED} == yes ]] || exit 0 DEBUGMODE=no -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.network.d/81-samba b/ublinux/rc.network.d/81-samba index 46621c6..255d0e8 100755 --- a/ublinux/rc.network.d/81-samba +++ b/ublinux/rc.network.d/81-samba @@ -5,11 +5,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null # Machine only diff --git a/ublinux/rc.network.d/90-ublinuxupdate b/ublinux/rc.network.d/90-ublinuxupdate index 9194257..578288b 100755 --- a/ublinux/rc.network.d/90-ublinuxupdate +++ b/ublinux/rc.network.d/90-ublinuxupdate @@ -11,11 +11,12 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/update; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.pamsession.d/01-placeondesktop b/ublinux/rc.pamsession.d/01-placeondesktop index 4bbf5ab..eb8ea12 100755 --- a/ublinux/rc.pamsession.d/01-placeondesktop +++ b/ublinux/rc.pamsession.d/01-placeondesktop @@ -11,9 +11,12 @@ shopt -s extglob ENABLED=yes [[ ${ENABLED} == yes ]] || exit 0 -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/kiosk; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.pamsession.d/02-journald-notify b/ublinux/rc.pamsession.d/02-journald-notify index 002782a..3b2a305 100755 --- a/ublinux/rc.pamsession.d/02-journald-notify +++ b/ublinux/rc.pamsession.d/02-journald-notify @@ -11,9 +11,12 @@ shopt -s extglob ENABLED=yes [[ ${ENABLED} == yes ]] || exit 0 -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/logging; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/network; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null @@ -265,7 +268,6 @@ ubconfig_journald_notify_live(){ # Если файл подключен как ресурс с функциями, то выйти return 0 2>/dev/null && return 0 - [[ -n ${SSC_ARGV0} ]] && SELF_FILE=${SSC_ARGV0} && SELF_NAME=${SSC_ARGV0##*/} && SELF_PATH=${SSC_ARGV0%/*} || { SELF_FILE=${0} && SELF_NAME=${0##*/} && SELF_PATH=${0%/*}; } if [[ -z $@ ]]; then while read -r FUNCTION; do $"${FUNCTION##* }" diff --git a/ublinux/rc.pamsession.d/03-certmonger-cepces b/ublinux/rc.pamsession.d/03-certmonger-cepces index afffb28..b0a3c5f 100755 --- a/ublinux/rc.pamsession.d/03-certmonger-cepces +++ b/ublinux/rc.pamsession.d/03-certmonger-cepces @@ -11,9 +11,12 @@ shopt -s extglob ENABLED=yes [[ ${ENABLED} == yes ]] || exit 0 -SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/logging; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/network; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.pamsession.d/04-user-locale b/ublinux/rc.pamsession.d/04-user-locale index 7f4dbff..878e65e 100755 --- a/ublinux/rc.pamsession.d/04-user-locale +++ b/ublinux/rc.pamsession.d/04-user-locale @@ -9,9 +9,14 @@ ENABLED=yes [[ ${ENABLED} == yes ]] || exit 0 +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null DEFAULT_CONF=$(< /usr/lib/ublinux/default) -[[ ${DEFAULT_CONF} =~ (^|$'\n')[[:blank:]]*SYSCONF=([^$|$'\n']+)[[:blank:]]*($|$'\n') ]] && SYSCONF=${BASH_REMATCH[2]} || SYSCONF="/etc/sysconf" +[[ ${DEFAULT_CONF} =~ (^|$'\n')[[:blank:]]*SYSCONF=([^$|$'\n']+)[[:blank:]]*($|$'\n') ]] && SYSCONF=${BASH_REMATCH[2]} || SYSCONF="/etc/ublinux" +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/users; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/01-system b/ublinux/rc.post.d/01-system index cf98de7..61bd327 100755 --- a/ublinux/rc.post.d/01-system +++ b/ublinux/rc.post.d/01-system @@ -10,10 +10,12 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" [[ -d /memory/run ]] && cp -fr /memory/run/* /run/ && rm -rf /memory/run [[ -f /etc/sysctl.conf ]] && sysctl -p /etc/sysctl.conf diff --git a/ublinux/rc.post.d/02-hwclock b/ublinux/rc.post.d/02-hwclock index 869a39a..26d4574 100755 --- a/ublinux/rc.post.d/02-hwclock +++ b/ublinux/rc.post.d/02-hwclock @@ -10,19 +10,19 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/clock; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null [[ ${SETCLKATSTART,,} =~ ^no$|^off$|^disable$ ]] && exit 0 - if [[ ${HWCLOCK_SYNC,,} == "utc" ]]; then - HWCLOCK_OPTIONS="--utc" + if [[ ${HWCLOCK_SYNC,,} == "utc" ]]; then + HWCLOCK_OPTIONS="--utc" elif [[ ${HWCLOCK_SYNC,,} == "localtime" ]]; then - HWCLOCK_OPTIONS="--localtime" + HWCLOCK_OPTIONS="--localtime" fi hwclock --hctosys ${HWCLOCK_OPTIONS} diff --git a/ublinux/rc.post.d/03-modprobepreload b/ublinux/rc.post.d/03-modprobepreload index 6b47560..3775a89 100755 --- a/ublinux/rc.post.d/03-modprobepreload +++ b/ublinux/rc.post.d/03-modprobepreload @@ -10,17 +10,17 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/hardware; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null if [[ ! ${MODPROBE_PRELOAD} == @("no"|"none"|"disable") ]]; then - [[ -r ${ROOTFS}/etc/modprobe.preload ]] && while IFS= read -ru3 SELECT_MODULE; do - modprobe ${SELECT_MODULE} - done 3< <(cat ${ROOTFS}/etc/modprobe.preload | sed s/'#.*'// | sed /^$/d) + [[ -r ${ROOTFS}/etc/modprobe.preload ]] && while IFS= read -ru3 SELECT_MODULE; do + modprobe ${SELECT_MODULE} + done 3< <(cat ${ROOTFS}/etc/modprobe.preload | sed s/'#.*'// | sed /^$/d) fi diff --git a/ublinux/rc.post.d/09-automount b/ublinux/rc.post.d/09-automount index f736a68..a52a7cf 100755 --- a/ublinux/rc.post.d/09-automount +++ b/ublinux/rc.post.d/09-automount @@ -12,10 +12,10 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/10-brand-backgrounds b/ublinux/rc.post.d/10-brand-backgrounds index d976318..dc39cfd 100755 --- a/ublinux/rc.post.d/10-brand-backgrounds +++ b/ublinux/rc.post.d/10-brand-backgrounds @@ -52,10 +52,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/11-xorg b/ublinux/rc.post.d/11-xorg index ca4f491..e37303e 100755 --- a/ublinux/rc.post.d/11-xorg +++ b/ublinux/rc.post.d/11-xorg @@ -10,10 +10,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/12-dm-background b/ublinux/rc.post.d/12-dm-background index 60f6cb4..a961636 100755 --- a/ublinux/rc.post.d/12-dm-background +++ b/ublinux/rc.post.d/12-dm-background @@ -10,10 +10,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/13-dconf b/ublinux/rc.post.d/13-dconf index 06e900f..02282fd 100755 --- a/ublinux/rc.post.d/13-dconf +++ b/ublinux/rc.post.d/13-dconf @@ -10,10 +10,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/16-kiosk-desktop b/ublinux/rc.post.d/16-kiosk-desktop index e3ba2ea..3c68983 100755 --- a/ublinux/rc.post.d/16-kiosk-desktop +++ b/ublinux/rc.post.d/16-kiosk-desktop @@ -10,10 +10,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null @@ -29,7 +29,7 @@ SOURCE=${SYSCONF}/kiosk; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null for USER in "${!APPDESKTOP_BLACKLIST[@]}"; do if [[ ${USER} == "LOCAL" ]]; then # for DESKTOP_FILE in $(tr ',;' '\n' <<< ${APPDESKTOP_BLACKLIST[${USER}]}); do - true + true # done elif [[ ${USER} == "GLOBAL" ]]; then for DESKTOP_FILE in $(tr ',;' '\n' <<< ${APPDESKTOP_BLACKLIST[${USER}]}); do @@ -37,7 +37,7 @@ SOURCE=${SYSCONF}/kiosk; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null for DESKTOP_FILE_FIND in $(find /usr/share/applications/ /usr/share/local/applications/ /home/*/.local/share/applications/ -type f -iname "*.desktop"); do DESKTOP_FILE_FIND_NAME=${DESKTOP_FILE_FIND##*/}; DESKTOP_FILE_FIND_NAME=${DESKTOP_FILE_FIND_NAME%.desktop} #Нужно сравнить с белым списком, и то что в белом списке есть не удалить -# if [[ ${DESKTOP_FILE_FIND_NAME} == +# if [[ ${DESKTOP_FILE_FIND_NAME} == done else rm -f /usr/share/applications/${DESKTOP_FILE}.desktop diff --git a/ublinux/rc.post.d/17-kiosk-gtk b/ublinux/rc.post.d/17-kiosk-gtk index e04648a..a01a8dc 100755 --- a/ublinux/rc.post.d/17-kiosk-gtk +++ b/ublinux/rc.post.d/17-kiosk-gtk @@ -10,10 +10,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/18-kiosk-xfce4-kioskrc b/ublinux/rc.post.d/18-kiosk-xfce4-kioskrc index 6672410..db62592 100755 --- a/ublinux/rc.post.d/18-kiosk-xfce4-kioskrc +++ b/ublinux/rc.post.d/18-kiosk-xfce4-kioskrc @@ -10,10 +10,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null @@ -22,11 +22,11 @@ SOURCE=${SYSCONF}/kiosk; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null ## Режим киоска XFCE4, запретить изменять параметры пользователям и группам ## XFCE4_KIOSK[:]= ## # Пользователи и группы, варианты значений: -## =ALL # Разрешить всем -## =NONE # Запретить +## =ALL # Разрешить всем +## =NONE # Запретить ## =@whell,@users # Разрешить группам -## =superadmin,user-1 # Разрешить пользователям -## =@wheel,user-1 # Разрешить группе и пользователю +## =superadmin,user-1 # Разрешить пользователям +## =@wheel,user-1 # Разрешить группе и пользователю #XFCE4_KIOSK[xfce4-panel:CustomizePanel]=@wheel KIOSKRC="/etc/xdg/xfce4/kiosk/kioskrc" @@ -53,7 +53,7 @@ SOURCE=${SYSCONF}/kiosk; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null ## # Пользователи и группы, варианты значений: ## =* # Все пользователи ## =@whell;@users # Указанные группы -## =superadmin;user-1 # Указанным пользователям +## =superadmin;user-1 # Указанным пользователям ## =@wheel;user-1 # Указанным группам и пользователям ## XFCE4_KIOSK_USER_LOCKED="*" @@ -64,7 +64,7 @@ SOURCE=${SYSCONF}/kiosk; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null ## # Пользователи и группы, варианты значений: ## =* # Все пользователи ## =@whell;@users # Указанные группы -## =superadmin;user-1 # Указанным пользователям +## =superadmin;user-1 # Указанным пользователям ## =@wheel;user-1 # Указанным группам и пользователям ## XFCE4_KIOSK_USER_UNLOCKED="root,@wheel" @@ -80,9 +80,7 @@ SOURCE=${SYSCONF}/kiosk; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null [[ -n ${XFCE4_KIOSK_USER_LOCKED} ]] && PARAM_LOCKED=" locked=\"${XFCE4_KIOSK_USER_LOCKED//,/;}\"" [[ -n ${XFCE4_KIOSK_USER_UNLOCKED} ]] && PARAM_UNLOCKED=" unlocked=\"${XFCE4_KIOSK_USER_UNLOCKED//,/;}\"" for FILE_CHANNEL_XML in ${PATH_XDG_XFCE_CHANNEL}/*.xml; do - sed -E "s/^]*>//" -i ${FILE_CHANNEL_XML} + sed -E "s/^]*>//" -i ${FILE_CHANNEL_XML} done fi fi - - \ No newline at end of file diff --git a/ublinux/rc.post.d/20-initrd b/ublinux/rc.post.d/20-initrd index e5a6e8d..9d6b191 100755 --- a/ublinux/rc.post.d/20-initrd +++ b/ublinux/rc.post.d/20-initrd @@ -10,10 +10,10 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null @@ -23,11 +23,11 @@ SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null # rm -f /boot/vmlinuz /boot/ublinux /boot/addon # if LC_ALL=C chkconfig --list tftp 2>/dev/null | grep -q off ;then # ln -sf /mnt/livemedia/ublinux/vmlinuz /boot -# ln -sf /mnt/livemedia/ublinux/ublinux /boot +# ln -sf /mnt/livemedia/ublinux/ublinux /boot # ln -sf /mnt/livemedia/ublinux/addon /boot # else -# cp -pf /mnt/livemedia/ublinux/vmlinuz /boot -# cp -pf /mnt/livemedia/ublinux/ublinux /boot -# cp -pf /mnt/livemedia/ublinux/addon /boot +# cp -pf /mnt/livemedia/ublinux/vmlinuz /boot +# cp -pf /mnt/livemedia/ublinux/ublinux /boot +# cp -pf /mnt/livemedia/ublinux/addon /boot # fi #fi diff --git a/ublinux/rc.post.d/23-publicdir b/ublinux/rc.post.d/23-publicdir index d791c29..6a26f3d 100755 --- a/ublinux/rc.post.d/23-publicdir +++ b/ublinux/rc.post.d/23-publicdir @@ -10,10 +10,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/24-samba-usershares b/ublinux/rc.post.d/24-samba-usershares index 774e729..a4db390 100755 --- a/ublinux/rc.post.d/24-samba-usershares +++ b/ublinux/rc.post.d/24-samba-usershares @@ -10,10 +10,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/30-network b/ublinux/rc.post.d/30-network index 9290aa6..60f559f 100755 --- a/ublinux/rc.post.d/30-network +++ b/ublinux/rc.post.d/30-network @@ -10,10 +10,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/35-soundprofile b/ublinux/rc.post.d/35-soundprofile index 10ca189..723dd68 100755 --- a/ublinux/rc.post.d/35-soundprofile +++ b/ublinux/rc.post.d/35-soundprofile @@ -4,10 +4,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/42-access-suid-sgid b/ublinux/rc.post.d/42-access-suid-sgid index 476d336..26b5031 100755 --- a/ublinux/rc.post.d/42-access-suid-sgid +++ b/ublinux/rc.post.d/42-access-suid-sgid @@ -12,10 +12,10 @@ DEBUGMODE=no SELF_NAME="42-access-suid-sgid" -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/43-access-exec b/ublinux/rc.post.d/43-access-exec index 8758762..6da6fe9 100755 --- a/ublinux/rc.post.d/43-access-exec +++ b/ublinux/rc.post.d/43-access-exec @@ -10,10 +10,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/44-mountattr b/ublinux/rc.post.d/44-mountattr index 0b8cd4a..dcc0f7d 100755 --- a/ublinux/rc.post.d/44-mountattr +++ b/ublinux/rc.post.d/44-mountattr @@ -10,10 +10,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/45-disk-quota b/ublinux/rc.post.d/45-disk-quota index 75527d2..8bc6630 100755 --- a/ublinux/rc.post.d/45-disk-quota +++ b/ublinux/rc.post.d/45-disk-quota @@ -10,10 +10,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/46-cgroup-quota b/ublinux/rc.post.d/46-cgroup-quota index a106b82..f43e124 100755 --- a/ublinux/rc.post.d/46-cgroup-quota +++ b/ublinux/rc.post.d/46-cgroup-quota @@ -10,10 +10,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/50-update-fonts b/ublinux/rc.post.d/50-update-fonts index 8c2b7e9..893bef8 100755 --- a/ublinux/rc.post.d/50-update-fonts +++ b/ublinux/rc.post.d/50-update-fonts @@ -10,12 +10,12 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null -/usr/lib/ublinux/rc.preinit.d/04-update-fonts \ No newline at end of file + ${ROOTFS}/usr/lib/ublinux/rc.preinit.d/04-update-fonts \ No newline at end of file diff --git a/ublinux/rc.post.d/51-theme b/ublinux/rc.post.d/51-theme index 13ad2f5..82b1d17 100755 --- a/ublinux/rc.post.d/51-theme +++ b/ublinux/rc.post.d/51-theme @@ -10,10 +10,10 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/60-blacklistdkms b/ublinux/rc.post.d/60-blacklistdkms index 0ce1ffa..85ed4b3 100755 --- a/ublinux/rc.post.d/60-blacklistdkms +++ b/ublinux/rc.post.d/60-blacklistdkms @@ -10,10 +10,10 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -ROOTFS= -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post/01-system b/ublinux/rc.post/01-system index 2d54355..74a6c6c 100755 --- a/ublinux/rc.post/01-system +++ b/ublinux/rc.post/01-system @@ -9,6 +9,11 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -. /usr/lib/ublinux/functions -debug_mode "$0" "$@" + +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" diff --git a/ublinux/rc.post/10-ldconfig b/ublinux/rc.post/10-ldconfig index 88a2278..33bfd98 100755 --- a/ublinux/rc.post/10-ldconfig +++ b/ublinux/rc.post/10-ldconfig @@ -9,9 +9,13 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -. /usr/lib/ublinux/functions -. /usr/lib/ublinux/default + +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null -debug_mode "$0" "$@" [[ ${RUNLDCONFIG} = "yes" ]] && /usr/bin/ldconfig diff --git a/ublinux/rc.post/20-plymouth b/ublinux/rc.post/20-plymouth index bb7be1c..ab05762 100755 --- a/ublinux/rc.post/20-plymouth +++ b/ublinux/rc.post/20-plymouth @@ -9,6 +9,12 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -debug_mode "$0" "$@" + +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" [[ -f /usr/bin/plymouth ]] || /usr/bin/pkill -f @lymouthd diff --git a/ublinux/rc.post/30-selinux b/ublinux/rc.post/30-selinux index 1122acb..80e2325 100755 --- a/ublinux/rc.post/30-selinux +++ b/ublinux/rc.post/30-selinux @@ -9,7 +9,13 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -debug_mode "$0" "$@" + +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" # For SELinux, you need to tell SELinux that aufs supports XATTR by these commands. # if [[ ${SELINUXENABLE} == "yes" ]]; then diff --git a/ublinux/rc.preinit.d/01-depmod b/ublinux/rc.preinit.d/01-depmod index c5f3df1..e89c55d 100755 --- a/ublinux/rc.preinit.d/01-depmod +++ b/ublinux/rc.preinit.d/01-depmod @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/02-modulespreload b/ublinux/rc.preinit.d/02-modulespreload index 46ef09a..dcafed2 100755 --- a/ublinux/rc.preinit.d/02-modulespreload +++ b/ublinux/rc.preinit.d/02-modulespreload @@ -17,17 +17,16 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 - -debug_mode "$0" "$@" - -MODULES_BLACKLIST=$(cmdline_value blacklist | tr ',;' ' ') +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/hardware; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +MODULES_BLACKLIST=$(cmdline_value blacklist | tr ',;' ' ') + exec_modulespreload(){ for SELECT_MODULE in ${MODULES_PRELOAD//,/ }; do [[ ${BLACK_LIST_MODULES} =~ (^|,|;)${SELECT_MODULE}(,|;|$) ]] || ${CMD_CHROOT} modprobe ${SELECT_MODULE} diff --git a/ublinux/rc.preinit.d/03-ldconfig b/ublinux/rc.preinit.d/03-ldconfig index a8ddee6..f789449 100755 --- a/ublinux/rc.preinit.d/03-ldconfig +++ b/ublinux/rc.preinit.d/03-ldconfig @@ -15,9 +15,9 @@ ENABLED=yes DEBUGMODE=no [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/04-update-fonts b/ublinux/rc.preinit.d/04-update-fonts index 44e3c0e..d0ead0f 100755 --- a/ublinux/rc.preinit.d/04-update-fonts +++ b/ublinux/rc.preinit.d/04-update-fonts @@ -17,9 +17,11 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -debug_mode "$0" "$@" +#SYSCONF="${ROOTFS}${SYSCONF}" exec_update_font_cache(){ for FONT_PATH in ${ROOTFS}/usr/share/fonts{,/default}/TTF ${ROOTFS}/usr/X11R6/lib/X11/fonts/TTF; do diff --git a/ublinux/rc.preinit.d/10-system b/ublinux/rc.preinit.d/10-system index b30075b..cedc576 100755 --- a/ublinux/rc.preinit.d/10-system +++ b/ublinux/rc.preinit.d/10-system @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/11-partitions b/ublinux/rc.preinit.d/11-partitions index 27cbcf8..388d719 100755 --- a/ublinux/rc.preinit.d/11-partitions +++ b/ublinux/rc.preinit.d/11-partitions @@ -12,19 +12,19 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin -DEBUGMODE=no [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -#SOURCE=${ROOTFS}/usr/lib/ublinux/scripts/liblinuxlive; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/mount; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +#SOURCE=${ROOTFS}/usr/lib/ublinux/scripts/liblinuxlive; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null ############################################################## ## TODO: Need to test diff --git a/ublinux/rc.preinit.d/12-save2module b/ublinux/rc.preinit.d/12-save2module index a4f9cc1..ddd970b 100755 --- a/ublinux/rc.preinit.d/12-save2module +++ b/ublinux/rc.preinit.d/12-save2module @@ -12,14 +12,14 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin -DEBUGMODE=no [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/13-release b/ublinux/rc.preinit.d/13-release index e9227b8..7360a1b 100755 --- a/ublinux/rc.preinit.d/13-release +++ b/ublinux/rc.preinit.d/13-release @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/20-services b/ublinux/rc.preinit.d/20-services index 68569c1..caa1da8 100755 --- a/ublinux/rc.preinit.d/20-services +++ b/ublinux/rc.preinit.d/20-services @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/21-ntp b/ublinux/rc.preinit.d/21-ntp index 4a33ba9..f07e319 100755 --- a/ublinux/rc.preinit.d/21-ntp +++ b/ublinux/rc.preinit.d/21-ntp @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/22-samba b/ublinux/rc.preinit.d/22-samba index a3e7e02..b8f8ce8 100755 --- a/ublinux/rc.preinit.d/22-samba +++ b/ublinux/rc.preinit.d/22-samba @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/23-realmd b/ublinux/rc.preinit.d/23-realmd index 4d43c73..f0d2467 100755 --- a/ublinux/rc.preinit.d/23-realmd +++ b/ublinux/rc.preinit.d/23-realmd @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/24-logging b/ublinux/rc.preinit.d/24-logging index a6c0a53..7969ec4 100755 --- a/ublinux/rc.preinit.d/24-logging +++ b/ublinux/rc.preinit.d/24-logging @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/30-network-hostname b/ublinux/rc.preinit.d/30-network-hostname index afa95fa..f55af9d 100755 --- a/ublinux/rc.preinit.d/30-network-hostname +++ b/ublinux/rc.preinit.d/30-network-hostname @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/31-network-proxy-system b/ublinux/rc.preinit.d/31-network-proxy-system index f2bca2c..8ecbf57 100755 --- a/ublinux/rc.preinit.d/31-network-proxy-system +++ b/ublinux/rc.preinit.d/31-network-proxy-system @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/32-network b/ublinux/rc.preinit.d/32-network index 2e0da51..9d30ad2 100755 --- a/ublinux/rc.preinit.d/32-network +++ b/ublinux/rc.preinit.d/32-network @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/35-iptables b/ublinux/rc.preinit.d/35-iptables index c74cc37..b52e3ba 100755 --- a/ublinux/rc.preinit.d/35-iptables +++ b/ublinux/rc.preinit.d/35-iptables @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/36-ufw b/ublinux/rc.preinit.d/36-ufw index 280535f..1af6e7d 100755 --- a/ublinux/rc.preinit.d/36-ufw +++ b/ublinux/rc.preinit.d/36-ufw @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/40-authpam b/ublinux/rc.preinit.d/40-authpam index 468efd4..687c205 100755 --- a/ublinux/rc.preinit.d/40-authpam +++ b/ublinux/rc.preinit.d/40-authpam @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/50-xorg b/ublinux/rc.preinit.d/50-xorg index 4b991db..5bd9c9b 100755 --- a/ublinux/rc.preinit.d/50-xorg +++ b/ublinux/rc.preinit.d/50-xorg @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/50-xorg-old b/ublinux/rc.preinit.d/50-xorg-old index bb9ea5d..9927888 100644 --- a/ublinux/rc.preinit.d/50-xorg-old +++ b/ublinux/rc.preinit.d/50-xorg-old @@ -9,6 +9,7 @@ ENABLED=no [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin @@ -33,10 +34,12 @@ SORTOPT= XFILE=etc/X11/xorg.conf DELETE_XORG_CONF=no -DEBUGMODE=no -. usr/lib/ublinux/functions -. usr/lib/ublinux/default -debug_mode "$0" "$@" +[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +SYSCONF="${ROOTFS}${SYSCONF}" [ -f /memory/changes/etc/ld.so.cache ] && GLLDCONFIG=no [ -f /memory/changes/etc/X11/xorg.conf ] && CREATE_XORG_CONF=no diff --git a/ublinux/rc.preinit.d/51-autologin b/ublinux/rc.preinit.d/51-autologin index 6504846..28b3502 100755 --- a/ublinux/rc.preinit.d/51-autologin +++ b/ublinux/rc.preinit.d/51-autologin @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/52-desktop b/ublinux/rc.preinit.d/52-desktop index 84916ec..b465948 100755 --- a/ublinux/rc.preinit.d/52-desktop +++ b/ublinux/rc.preinit.d/52-desktop @@ -16,9 +16,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/53-language b/ublinux/rc.preinit.d/53-language index 1d73ca1..5753e91 100755 --- a/ublinux/rc.preinit.d/53-language +++ b/ublinux/rc.preinit.d/53-language @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/54-backgrounds b/ublinux/rc.preinit.d/54-backgrounds index 25d4b32..95a22d6 100755 --- a/ublinux/rc.preinit.d/54-backgrounds +++ b/ublinux/rc.preinit.d/54-backgrounds @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/55-multiseat b/ublinux/rc.preinit.d/55-multiseat index 0a49a2e..247502a 100755 --- a/ublinux/rc.preinit.d/55-multiseat +++ b/ublinux/rc.preinit.d/55-multiseat @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/56-openssl-engine b/ublinux/rc.preinit.d/56-openssl-engine index b05715f..607d106 100755 --- a/ublinux/rc.preinit.d/56-openssl-engine +++ b/ublinux/rc.preinit.d/56-openssl-engine @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/57-access-denied-vtx11 b/ublinux/rc.preinit.d/57-access-denied-vtx11 index cb3d3f6..b5b5ce1 100755 --- a/ublinux/rc.preinit.d/57-access-denied-vtx11 +++ b/ublinux/rc.preinit.d/57-access-denied-vtx11 @@ -14,12 +14,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin - [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/58-access-login b/ublinux/rc.preinit.d/58-access-login index 9910b85..7e594ce 100755 --- a/ublinux/rc.preinit.d/58-access-login +++ b/ublinux/rc.preinit.d/58-access-login @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/59-polkit b/ublinux/rc.preinit.d/59-polkit index 1d53206..1c2c337 100755 --- a/ublinux/rc.preinit.d/59-polkit +++ b/ublinux/rc.preinit.d/59-polkit @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/60-lightdm-settings b/ublinux/rc.preinit.d/60-lightdm-settings index 1b75dca..4bfc7b8 100755 --- a/ublinux/rc.preinit.d/60-lightdm-settings +++ b/ublinux/rc.preinit.d/60-lightdm-settings @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/63-xorg-dpi b/ublinux/rc.preinit.d/63-xorg-dpi index 757fc0a..68952aa 100755 --- a/ublinux/rc.preinit.d/63-xorg-dpi +++ b/ublinux/rc.preinit.d/63-xorg-dpi @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/64-swapspace b/ublinux/rc.preinit.d/64-swapspace index 834f951..84ff283 100755 --- a/ublinux/rc.preinit.d/64-swapspace +++ b/ublinux/rc.preinit.d/64-swapspace @@ -17,10 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 - -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/65-kesl b/ublinux/rc.preinit.d/65-kesl index 63ef268..9dbcd82 100755 --- a/ublinux/rc.preinit.d/65-kesl +++ b/ublinux/rc.preinit.d/65-kesl @@ -21,9 +21,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/70-virtualbox b/ublinux/rc.preinit.d/70-virtualbox index ac1545c..ce13552 100755 --- a/ublinux/rc.preinit.d/70-virtualbox +++ b/ublinux/rc.preinit.d/70-virtualbox @@ -17,9 +17,11 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" if grep -qi virtualbox /sys/devices/virtual/dmi/id/*name; then echo -e vboxguest\\nvboxsf\\nvboxvideo > ${ROOTFS}/usr/lib/modules-load.d/vbox-guest-additions.conf diff --git a/ublinux/rc.preinit.d/71-vmware b/ublinux/rc.preinit.d/71-vmware index 82f4f7b..38b2f41 100755 --- a/ublinux/rc.preinit.d/71-vmware +++ b/ublinux/rc.preinit.d/71-vmware @@ -17,9 +17,11 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" if grep -qi vmware /sys/devices/virtual/dmi/id/*name; then [[ -f ${ROOTFS}/usr/lib/systemd/system/vmtoolsd.service ]] && ln -sf /usr/lib/systemd/system/vmtoolsd.service ${ROOTFS}/etc/systemd/system/multi-user.target.wants/vmtoolsd.service diff --git a/ublinux/rc.preinit.d/72-hyperv b/ublinux/rc.preinit.d/72-hyperv index 167ac58..08c3db0 100755 --- a/ublinux/rc.preinit.d/72-hyperv +++ b/ublinux/rc.preinit.d/72-hyperv @@ -17,16 +17,18 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -if grep -qi Microsoft /sys/devices/virtual/dmi/id/*vendor; then - [ -f usr/lib/systemd/system/hv_fcopy_daemon.service ] && ln -sf /usr/lib/systemd/system/hv_fcopy_daemon.service etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service - [ -f usr/lib/systemd/system/hv_kvp_daemon.service ] && ln -sf /usr/lib/systemd/system/hv_kvp_daemon.service etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service - [ -f usr/lib/systemd/system/hv_vss_daemon.service ] && ln -sf /usr/lib/systemd/system/hv_vss_daemon.service etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service -else - rm -f etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service - rm -f etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service - rm -f etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service -fi +#SYSCONF="${ROOTFS}${SYSCONF}" + + if grep -qi "Microsoft" /sys/devices/virtual/dmi/id/*vendor; then + [[ -f ${ROOTFS}/usr/lib/systemd/system/hv_fcopy_daemon.service ]] && ln -sf /usr/lib/systemd/system/hv_fcopy_daemon.service ${ROOTFS}/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service + [[ -f ${ROOTFS}/usr/lib/systemd/system/hv_kvp_daemon.service ]] && ln -sf /usr/lib/systemd/system/hv_kvp_daemon.service ${ROOTFS}/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service + [[ -f ${ROOTFS}/usr/lib/systemd/system/hv_vss_daemon.service ]] && ln -sf /usr/lib/systemd/system/hv_vss_daemon.service ${ROOTFS}/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service + else + rm -f ${ROOTFS}/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service + rm -f ${ROOTFS}/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service + rm -f ${ROOTFS}/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service + fi diff --git a/ublinux/rc.preinit.d/73-qemu b/ublinux/rc.preinit.d/73-qemu index f4a4234..d4e91ac 100755 --- a/ublinux/rc.preinit.d/73-qemu +++ b/ublinux/rc.preinit.d/73-qemu @@ -17,9 +17,11 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" # if grep -qi qemu /sys/devices/virtual/dmi/id/*vendor; then # [[ -f usr/lib/systemd/system/qemu-guest-agent.service ]] && ln -sf /usr/lib/systemd/system/qemu-guest-agent.service etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service diff --git a/ublinux/rc.preinit.d/80-server-storage b/ublinux/rc.preinit.d/80-server-storage index bee315a..73fa4ab 100755 --- a/ublinux/rc.preinit.d/80-server-storage +++ b/ublinux/rc.preinit.d/80-server-storage @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/90-apparmor b/ublinux/rc.preinit.d/90-apparmor index 15c4716..0ad8e6b 100755 --- a/ublinux/rc.preinit.d/90-apparmor +++ b/ublinux/rc.preinit.d/90-apparmor @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit.d/99-osinstall b/ublinux/rc.preinit.d/99-osinstall index 5ea3c0d..42989d7 100755 --- a/ublinux/rc.preinit.d/99-osinstall +++ b/ublinux/rc.preinit.d/99-osinstall @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit/01-inifile b/ublinux/rc.preinit/01-inifile index 6a30dc0..ebc8188 100755 --- a/ublinux/rc.preinit/01-inifile +++ b/ublinux/rc.preinit/01-inifile @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" diff --git a/ublinux/rc.preinit/02-skel-adds b/ublinux/rc.preinit/02-skel-adds index f7b5437..d9169d0 100755 --- a/ublinux/rc.preinit/02-skel-adds +++ b/ublinux/rc.preinit/02-skel-adds @@ -17,9 +17,9 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit/03-initvars b/ublinux/rc.preinit/03-initvars index 75877ff..0c3718c 100755 --- a/ublinux/rc.preinit/03-initvars +++ b/ublinux/rc.preinit/03-initvars @@ -17,8 +17,11 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +#SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +#SYSCONF="${ROOTFS}${SYSCONF}" # Filter not variable sell symbols from param kernel INITVARS_DATA=$(grep -Eiv ".*-.*=.*|.*\..*=.*" ${ROOTFS}/etc/initvars) diff --git a/ublinux/rc.preinit/05-save-clean b/ublinux/rc.preinit/05-save-clean index ec09b21..052c5b8 100755 --- a/ublinux/rc.preinit/05-save-clean +++ b/ublinux/rc.preinit/05-save-clean @@ -15,9 +15,9 @@ ENABLED=yes DEBUGMODE=no [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit/06-statemode b/ublinux/rc.preinit/06-statemode index fbf7b36..c39d20e 100755 --- a/ublinux/rc.preinit/06-statemode +++ b/ublinux/rc.preinit/06-statemode @@ -15,9 +15,9 @@ ENABLED=yes DEBUGMODE=no [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" diff --git a/ublinux/rc.preinit/08-prettyname b/ublinux/rc.preinit/08-prettyname index 27ce068..2158d03 100755 --- a/ublinux/rc.preinit/08-prettyname +++ b/ublinux/rc.preinit/08-prettyname @@ -15,9 +15,9 @@ ENABLED=yes DEBUGMODE=no [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" diff --git a/ublinux/rc.preinit/10-accounts b/ublinux/rc.preinit/10-accounts index 4c96a8b..1d4b536 100755 --- a/ublinux/rc.preinit/10-accounts +++ b/ublinux/rc.preinit/10-accounts @@ -16,13 +16,10 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin -[[ -f /usr/bin/bash ]] && /usr/bin/bash --version | grep -q ^"GNU bash" || exit 1 -[[ -d ${SSC_EXTRACT_DIR} ]] && rm -rf "${SSC_EXTRACT_DIR}" -[[ -n ${SSC_ARGV0} ]] && SELF_FILE=${SSC_ARGV0} && SELF_NAME=${SSC_ARGV0##*/} && SELF_PATH=${SSC_ARGV0%/*} || { SELF_FILE=${0} && SELF_NAME=${0##*/} && SELF_PATH=${0%/*}; } [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "${SELF_FILE}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit/20-remount b/ublinux/rc.preinit/20-remount index ae79646..818d673 100755 --- a/ublinux/rc.preinit/20-remount +++ b/ublinux/rc.preinit/20-remount @@ -15,9 +15,9 @@ ENABLED=yes DEBUGMODE=no [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "$0" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.preinit/50-install-pkg b/ublinux/rc.preinit/50-install-pkg index 8ad8fe2..edbea2d 100755 --- a/ublinux/rc.preinit/50-install-pkg +++ b/ublinux/rc.preinit/50-install-pkg @@ -14,13 +14,10 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } DEBUGMODE=no -[[ -f /usr/bin/bash ]] && /usr/bin/bash --version | grep -q ^"GNU bash" || exit 1 -[[ -d ${SSC_EXTRACT_DIR} ]] && rm -rf "${SSC_EXTRACT_DIR}" -[[ -n ${SSC_ARGV0} ]] && SELF_FILE=${SSC_ARGV0} && SELF_NAME=${SSC_ARGV0##*/} && SELF_PATH=${SSC_ARGV0%/*} || { SELF_FILE=${0} && SELF_NAME=${0##*/} && SELF_PATH=${0%/*}; } [[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; } -SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 -debug_mode "${SELF_FILE}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +debug_mode "${SSC_ARGV0:-$0}" "$@" +SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SYSCONF="${ROOTFS}${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.profile/00-envvars b/ublinux/rc.profile/00-envvars index 0f2d582..7939db5 100755 --- a/ublinux/rc.profile/00-envvars +++ b/ublinux/rc.profile/00-envvars @@ -8,6 +8,7 @@ # Used as a source ENABLED=yes +#[[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } if [[ ${ENABLED} == "yes" ]]; then if [[ $(readlink -fq /usr/bin/init 2>/dev/null) =~ "lib/systemd/systemd"$ ]]; then set -a diff --git a/ublinux/rc.profile/01-de-background b/ublinux/rc.profile/01-de-background index 0eff2ba..edf48b4 100755 --- a/ublinux/rc.profile/01-de-background +++ b/ublinux/rc.profile/01-de-background @@ -8,7 +8,7 @@ # Used as a source ENABLED=yes - +#[[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } if [[ ${ENABLED} == "yes" ]]; then DEFAULT_CONF=$(< /usr/lib/ublinux/default) [[ ${DEFAULT_CONF} =~ (^|$'\n')[[:blank:]]*SYSCONF=([^$|$'\n']+)[[:blank:]]*($|$'\n') ]] && SYSCONF=${BASH_REMATCH[2]} || SYSCONF="/etc/sysconf" @@ -23,34 +23,34 @@ xfce4_background(){ #Получить типы мониторов без xrandr: xfconf-query -c xfce4-desktop -l | grep "/backdrop/screen0/monitor.*/workspace0/last-image #Глобально заменить фон: install -Dm0644 ${BACKGROUND_DE} /usr/share/backgrounds/background.jpg case ${BACKGROUND_DE_MODE} in - 0) BACKGROUND_DE_MODE_XFCE4=5 ;; - 1) BACKGROUND_DE_MODE_XFCE4=4 ;; - 2) BACKGROUND_DE_MODE_XFCE4=1 ;; - *) BACKGROUND_DE_MODE_XFCE4=5 ;; + 0) BACKGROUND_DE_MODE_XFCE4=5 ;; + 1) BACKGROUND_DE_MODE_XFCE4=4 ;; + 2) BACKGROUND_DE_MODE_XFCE4=1 ;; + *) BACKGROUND_DE_MODE_XFCE4=5 ;; esac #[[ -z ${BACKGROUND_DE_MODE_XFCE4} && ${BACKGROUND_DE_MODE} == 0 ]] && BACKGROUND_DE_MODE_XFCE4=5 #[[ -z ${BACKGROUND_DE_MODE_XFCE4} && ${BACKGROUND_DE_MODE} == 1 ]] && BACKGROUND_DE_MODE_XFCE4=4 #[[ -z ${BACKGROUND_DE_MODE_XFCE4} && ${BACKGROUND_DE_MODE} == 2 ]] && BACKGROUND_DE_MODE_XFCE4=1 #[[ -z ${BACKGROUND_DE_MODE_XFCE4} ]] && BACKGROUND_DE_MODE_XFCE4=5 while read MONITOR_TYPE; do - xfconf-query --channel xfce4-desktop --property /backdrop/screen0/monitor${MONITOR_TYPE}/workspace0/image-style --create --type int --set "${BACKGROUND_DE_MODE_XFCE4}" - xfconf-query --channel xfce4-desktop --property /backdrop/screen0/monitor${MONITOR_TYPE}/workspace0/last-image --create --type string --set "${BACKGROUND_DE}" + xfconf-query --channel xfce4-desktop --property /backdrop/screen0/monitor${MONITOR_TYPE}/workspace0/image-style --create --type int --set "${BACKGROUND_DE_MODE_XFCE4}" + xfconf-query --channel xfce4-desktop --property /backdrop/screen0/monitor${MONITOR_TYPE}/workspace0/last-image --create --type string --set "${BACKGROUND_DE}" done < <(xrandr | grep -w connected | cut -d" " -f1) } plasma_background(){ [[ -x /usr/bin/plasmashell ]] || return 0 case ${BACKGROUND_DE_MODE} in - 0) BACKGROUND_DE_MODE_PLASMA=- ;; - 1) BACKGROUND_DE_MODE_PLASMA=1 ;; - 2) BACKGROUND_DE_MODE_PLASMA=0 ;; - *) BACKGROUND_DE_MODE_PLASMA=- ;; + 0) BACKGROUND_DE_MODE_PLASMA=- ;; + 1) BACKGROUND_DE_MODE_PLASMA=1 ;; + 2) BACKGROUND_DE_MODE_PLASMA=0 ;; + *) BACKGROUND_DE_MODE_PLASMA=- ;; esac #[[ -z ${BACKGROUND_DE_MODE_PLASMA} && ${BACKGROUND_DE_MODE} == 0 ]] && BACKGROUND_DE_MODE_PLASMA=- #[[ -z ${BACKGROUND_DE_MODE_PLASMA} && ${BACKGROUND_DE_MODE} == 1 ]] && BACKGROUND_DE_MODE_PLASMA=1 #[[ -z ${BACKGROUND_DE_MODE_PLASMA} && ${BACKGROUND_DE_MODE} == 2 ]] && BACKGROUND_DE_MODE_PLASMA=0 #[[ -z ${BACKGROUND_DE_MODE_PLASMA} ]] && BACKGROUND_DE_MODE_PLASMA=- if [[ ${BACKGROUND_DE_MODE_PLASMA} == "-" ]]; then - kwriteconfig5 --file plasma-org.kde.plasma.desktop-appletsrc --group 'Containments' --group '1' --group 'Wallpaper' --group 'org.kde.image' --group 'General' --key 'FillMode' --delete + kwriteconfig5 --file plasma-org.kde.plasma.desktop-appletsrc --group 'Containments' --group '1' --group 'Wallpaper' --group 'org.kde.image' --group 'General' --key 'FillMode' --delete else kwriteconfig5 --file plasma-org.kde.plasma.desktop-appletsrc --group 'Containments' --group '1' --group 'Wallpaper' --group 'org.kde.image' --group 'General' --key 'FillMode' "${BACKGROUND_DE_MODE_PLASMA}" fi @@ -61,10 +61,10 @@ gnome_background(){ [[ -f /usr/share/xsessions/gnome.desktop ]] || return 0 # Определяет способ отрисовки изображения для фона рабочего стола. Возможные значения: «none», «wallpaper», «centered», «scaled», «stretched», «zoom», «spanned». case ${BACKGROUND_DE_MODE} in - 0) BACKGROUND_DE_MODE_GNOME="zoom" ;; - 1) BACKGROUND_DE_MODE_GNOME="scaled" ;; - 2) BACKGROUND_DE_MODE_GNOME="stretched" ;; - *) BACKGROUND_DE_MODE_GNOME="zoom" ;; + 0) BACKGROUND_DE_MODE_GNOME="zoom" ;; + 1) BACKGROUND_DE_MODE_GNOME="scaled" ;; + 2) BACKGROUND_DE_MODE_GNOME="stretched" ;; + *) BACKGROUND_DE_MODE_GNOME="zoom" ;; esac gsettings set org.gnome.desktop.background picture-uri "file://${BACKGROUND_DE}" gsettings set org.gnome.desktop.background picture-uri-dark "file://${BACKGROUND_DE}" @@ -74,10 +74,10 @@ pantheon_background(){ [[ -f /usr/share/xsessions/pantheon.desktop ]] || return 0 # Определяет способ отрисовки изображения для фона рабочего стола. Возможные значения: «none», «wallpaper», «centered», «scaled», «stretched», «zoom», «spanned». case ${BACKGROUND_DE_MODE} in - 0) BACKGROUND_DE_MODE_PANTHEON="zoom" ;; - 1) BACKGROUND_DE_MODE_PANTHEON="scaled" ;; - 2) BACKGROUND_DE_MODE_PANTHEON="stretched" ;; - *) BACKGROUND_DE_MODE_PANTHEON="zoom" ;; + 0) BACKGROUND_DE_MODE_PANTHEON="zoom" ;; + 1) BACKGROUND_DE_MODE_PANTHEON="scaled" ;; + 2) BACKGROUND_DE_MODE_PANTHEON="stretched" ;; + *) BACKGROUND_DE_MODE_PANTHEON="zoom" ;; esac gsettings set org.gnome.desktop.background picture-uri "file://${BACKGROUND_DE}" gsettings set org.gnome.desktop.background picture-uri-dark "file://${BACKGROUND_DE}" @@ -101,23 +101,23 @@ cinammon_background(){ ################ if [[ -n ${BACKGROUND_DE} && ${BACKGROUND_DE} != @(none|no|disable|" ") ]]; then - if [[ -d ${BACKGROUND_DE} ]]; then - BACKGROUND_DE=$(ls -p ${BACKGROUND_DE} | grep -v / | shuf -n 1) - elif [[ ${BACKGROUND_DE} =~ ^'#'......$ ]]; then - BACKGROUND_HEX=${BACKGROUND_DE} - BACKGROUND_DE="/tmp/background-${USER}/${BACKGROUND_DE//#/}.png" - install -dm755 ${BACKGROUND_DE%/*} 2>/dev/null - convert -size 128x128 xc:"${BACKGROUND_HEX}" "${BACKGROUND_DE}" 2>/dev/null - fi - [[ -f ${BACKGROUND_DE} ]] && file "${BACKGROUND_DE}" 2>/dev/null | grep -qE 'image|bitmap' || BACKGROUND_DE=/usr/share/backgrounds/background.jpg - xfce4_background - plasma_background - gnome_background - pantheon_background - lxde_background - lxqt_background - mate_background - cinammon_background + if [[ -d ${BACKGROUND_DE} ]]; then + BACKGROUND_DE=$(ls -p ${BACKGROUND_DE} | grep -v / | shuf -n 1) + elif [[ ${BACKGROUND_DE} =~ ^'#'......$ ]]; then + BACKGROUND_HEX=${BACKGROUND_DE} + BACKGROUND_DE="/tmp/background-${USER}/${BACKGROUND_DE//#/}.png" + install -dm755 ${BACKGROUND_DE%/*} 2>/dev/null + convert -size 128x128 xc:"${BACKGROUND_HEX}" "${BACKGROUND_DE}" 2>/dev/null + fi + [[ -f ${BACKGROUND_DE} ]] && file "${BACKGROUND_DE}" 2>/dev/null | grep -qE 'image|bitmap' || BACKGROUND_DE=/usr/share/backgrounds/background.jpg + xfce4_background + plasma_background + gnome_background + pantheon_background + lxde_background + lxqt_background + mate_background + cinammon_background fi fi diff --git a/ublinux/rc.profile/02-xrandr b/ublinux/rc.profile/02-xrandr index ab7b525..c22402e 100755 --- a/ublinux/rc.profile/02-xrandr +++ b/ublinux/rc.profile/02-xrandr @@ -8,7 +8,7 @@ # Used as a source ENABLED=yes - +#[[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } if [[ ${ENABLED} == "yes" ]]; then DEFAULT_CONF=$(< /usr/lib/ublinux/default) [[ ${DEFAULT_CONF} =~ (^|$'\n')[[:blank:]]*SYSCONF=([^$|$'\n']+)[[:blank:]]*($|$'\n') ]] && SYSCONF=${BASH_REMATCH[2]} || SYSCONF="/etc/sysconf" @@ -17,7 +17,7 @@ if [[ ${ENABLED} == "yes" ]]; then SOURCE=${SYSCONF}/video; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/desktop; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null -## +## ##XFCE x11 ## SESSION_MANAGER=local/ubpc-1:@/tmp/.ICE-unix/12234,unix/ubpc-1:/tmp/.ICE-unix/12234 ## DESKTOP_SESSION=xfce @@ -47,7 +47,7 @@ if [[ ${ENABLED} == "yes" ]]; then ## XDG_SESSION_TYPE=tty ## TERM=xterm-256color ## XDG_SESSION_ID=24 -## +## if [[ -n ${XDG_SESSION_DESKTOP} && ${XDG_SESSION_TYPE} == "x11" && -n ${DISPLAY} ]]; then ## Parametrs: @@ -55,58 +55,58 @@ if [[ ${ENABLED} == "yes" ]]; then ## lo|LeftOf:{name} , ro|RightOf:{name} , ab|Above:{name} , be|Below:{name} , rotate:normal|left|right|invert [[ $(declare -p XRANDR_MONITOR 2>/dev/null) =~ ^"declare -A" ]] || declare -gA XRANDR_MONITOR [[ ${#XRANDR_MONITOR[@]} -ne 0 ]] && for VIDEO_PORT in "${!XRANDR_MONITOR[@]}"; do - SOFT_MODELINE="gtf" - SOFT_MODELINE_R= - while read VIDEO_PORT_PARAM; do - MODELINE= - if grep -Eiq "^[0-9]*x[0-9]*$|^[0-9]*x[0-9]*x[0-9]*$" <<< "${VIDEO_PORT_PARAM}"; then - if [[ -n ${SOFT_MODELINE_R} ]]; then - MODELINE=$(cvt -r $(sed 's/\([0-9]* [0-9]*\) .*/\1/' <<< ${VIDEO_PORT_PARAM//x/ }) | sed '/^\s*$/d ; /^\s*#/d ; s/\s*Modeline //') - SOFT_MODELINE_R= - elif [[ ${SOFT_MODELINE} == "cvt" ]]; then - MODELINE=$(cvt ${VIDEO_PORT_PARAM//x/ } | sed '/^\s*$/d ; /^\s*#/d ; s/\s*Modeline //') - else - if grep -Eiq "^[0-9]*x[0-9]*$" <<< "${VIDEO_PORT_PARAM}"; then - MODELINE=$(gtf ${VIDEO_PORT_PARAM//x/ } 60 | sed '/^\s*$/d ; /^\s*#/d ; s/\s*Modeline //') - else - MODELINE=$(gtf ${VIDEO_PORT_PARAM//x/ } | sed '/^\s*$/d ; /^\s*#/d ; s/\s*Modeline //') - fi - fi - elif grep -Eiq "^cvt$" <<< "${VIDEO_PORT_PARAM}"; then - SOFT_MODELINE="cvt" - elif grep -Eiq "^gtf$" <<< "${VIDEO_PORT_PARAM}"; then - SOFT_MODELINE="gtf" - elif grep -Eiq "^reduced|r$" <<< "${VIDEO_PORT_PARAM}"; then - SOFT_MODELINE_R="reduced" - elif grep -Eiq "^auto$" <<< "${VIDEO_PORT_PARAM}"; then - xrandr --output ${VIDEO_PORT^^} --auto - elif grep -Eiq "^preferred$" <<< "${VIDEO_PORT_PARAM}"; then - xrandr --output ${VIDEO_PORT^^} --preferred - elif grep -Eiq "^off$" <<< "${VIDEO_PORT_PARAM}"; then - xrandr --output ${VIDEO_PORT^^} --off - elif grep -Eiq "^primary$" <<< "${VIDEO_PORT_PARAM}"; then - xrandr --output ${VIDEO_PORT^^} --primary - elif grep -Eiq "^mode:[0-9x_]*$" <<< "${VIDEO_PORT_PARAM}"; then - xrandr --output ${VIDEO_PORT^^} --mode $(cut -d: -f2 <<< ${VIDEO_PORT_PARAM}) - elif grep -Eiq "^mode:[0-9x_]*:[0-9]*$" <<< "${VIDEO_PORT_PARAM}"; then - xrandr --output ${VIDEO_PORT^^} --mode $(cut -d: -f2 <<< ${VIDEO_PORT_PARAM}) --rate $(cut -d: -f3 <<< ${VIDEO_PORT_PARAM}) - elif grep -Eiq "^lo:[[:alnum:]]*$|^LeftOf:[[:alnum:]]*$" <<< "${VIDEO_PORT_PARAM}"; then - xrandr --output ${VIDEO_PORT^^} --left-of $(cut -d: -f2 <<< ${VIDEO_PORT_PARAM^^}) - elif grep -Eiq "^ro:[[:alnum:]]*$|^RightOf:[[:alnum:]]*$" <<< "${VIDEO_PORT_PARAM}"; then - xrandr --output ${VIDEO_PORT^^} --right-of $(cut -d: -f2 <<< ${VIDEO_PORT_PARAM^^}) - elif grep -Eiq "^ab:[[:alnum:]]*$|^Above:[[:alnum:]]*$" <<< "${VIDEO_PORT_PARAM}"; then - xrandr --output ${VIDEO_PORT^^} --above $(cut -d: -f2 <<< ${VIDEO_PORT_PARAM^^}) - elif grep -Eiq "^be:[[:alnum:]]*$|^Below:[[:alnum:]]*$" <<< "${VIDEO_PORT_PARAM}"; then - xrandr --output ${VIDEO_PORT^^} --below $(cut -d: -f2 <<< ${VIDEO_PORT_PARAM^^}) - elif grep -Eiq "^Rotate:[[:alpha:]]*$" <<< "${VIDEO_PORT_PARAM}"; then - xrandr --output ${VIDEO_PORT^^} --rotate $(cut -d: -f2 <<< ${VIDEO_PORT_PARAM^^}) - fi - if [[ -n ${MODELINE} ]]; then + SOFT_MODELINE="gtf" + SOFT_MODELINE_R= + while read VIDEO_PORT_PARAM; do + MODELINE= + if grep -Eiq "^[0-9]*x[0-9]*$|^[0-9]*x[0-9]*x[0-9]*$" <<< "${VIDEO_PORT_PARAM}"; then + if [[ -n ${SOFT_MODELINE_R} ]]; then + MODELINE=$(cvt -r $(sed 's/\([0-9]* [0-9]*\) .*/\1/' <<< ${VIDEO_PORT_PARAM//x/ }) | sed '/^\s*$/d ; /^\s*#/d ; s/\s*Modeline //') + SOFT_MODELINE_R= + elif [[ ${SOFT_MODELINE} == "cvt" ]]; then + MODELINE=$(cvt ${VIDEO_PORT_PARAM//x/ } | sed '/^\s*$/d ; /^\s*#/d ; s/\s*Modeline //') + else + if grep -Eiq "^[0-9]*x[0-9]*$" <<< "${VIDEO_PORT_PARAM}"; then + MODELINE=$(gtf ${VIDEO_PORT_PARAM//x/ } 60 | sed '/^\s*$/d ; /^\s*#/d ; s/\s*Modeline //') + else + MODELINE=$(gtf ${VIDEO_PORT_PARAM//x/ } | sed '/^\s*$/d ; /^\s*#/d ; s/\s*Modeline //') + fi + fi + elif grep -Eiq "^cvt$" <<< "${VIDEO_PORT_PARAM}"; then + SOFT_MODELINE="cvt" + elif grep -Eiq "^gtf$" <<< "${VIDEO_PORT_PARAM}"; then + SOFT_MODELINE="gtf" + elif grep -Eiq "^reduced|r$" <<< "${VIDEO_PORT_PARAM}"; then + SOFT_MODELINE_R="reduced" + elif grep -Eiq "^auto$" <<< "${VIDEO_PORT_PARAM}"; then + xrandr --output ${VIDEO_PORT^^} --auto + elif grep -Eiq "^preferred$" <<< "${VIDEO_PORT_PARAM}"; then + xrandr --output ${VIDEO_PORT^^} --preferred + elif grep -Eiq "^off$" <<< "${VIDEO_PORT_PARAM}"; then + xrandr --output ${VIDEO_PORT^^} --off + elif grep -Eiq "^primary$" <<< "${VIDEO_PORT_PARAM}"; then + xrandr --output ${VIDEO_PORT^^} --primary + elif grep -Eiq "^mode:[0-9x_]*$" <<< "${VIDEO_PORT_PARAM}"; then + xrandr --output ${VIDEO_PORT^^} --mode $(cut -d: -f2 <<< ${VIDEO_PORT_PARAM}) + elif grep -Eiq "^mode:[0-9x_]*:[0-9]*$" <<< "${VIDEO_PORT_PARAM}"; then + xrandr --output ${VIDEO_PORT^^} --mode $(cut -d: -f2 <<< ${VIDEO_PORT_PARAM}) --rate $(cut -d: -f3 <<< ${VIDEO_PORT_PARAM}) + elif grep -Eiq "^lo:[[:alnum:]]*$|^LeftOf:[[:alnum:]]*$" <<< "${VIDEO_PORT_PARAM}"; then + xrandr --output ${VIDEO_PORT^^} --left-of $(cut -d: -f2 <<< ${VIDEO_PORT_PARAM^^}) + elif grep -Eiq "^ro:[[:alnum:]]*$|^RightOf:[[:alnum:]]*$" <<< "${VIDEO_PORT_PARAM}"; then + xrandr --output ${VIDEO_PORT^^} --right-of $(cut -d: -f2 <<< ${VIDEO_PORT_PARAM^^}) + elif grep -Eiq "^ab:[[:alnum:]]*$|^Above:[[:alnum:]]*$" <<< "${VIDEO_PORT_PARAM}"; then + xrandr --output ${VIDEO_PORT^^} --above $(cut -d: -f2 <<< ${VIDEO_PORT_PARAM^^}) + elif grep -Eiq "^be:[[:alnum:]]*$|^Below:[[:alnum:]]*$" <<< "${VIDEO_PORT_PARAM}"; then + xrandr --output ${VIDEO_PORT^^} --below $(cut -d: -f2 <<< ${VIDEO_PORT_PARAM^^}) + elif grep -Eiq "^Rotate:[[:alpha:]]*$" <<< "${VIDEO_PORT_PARAM}"; then + xrandr --output ${VIDEO_PORT^^} --rotate $(cut -d: -f2 <<< ${VIDEO_PORT_PARAM^^}) + fi + if [[ -n ${MODELINE} ]]; then xrandr --newmode ${MODELINE} - xrandr --addmode ${VIDEO_PORT^^} $(cut -d" " -f1 <<< ${MODELINE}) - xrandr --output ${VIDEO_PORT^^} --mode $(cut -d" " -f1 <<< ${MODELINE}) - fi - done < <(tr ',' '\n' <<< "${XRANDR_MONITOR[${VIDEO_PORT}]}") + xrandr --addmode ${VIDEO_PORT^^} $(cut -d" " -f1 <<< ${MODELINE}) + xrandr --output ${VIDEO_PORT^^} --mode $(cut -d" " -f1 <<< ${MODELINE}) + fi + done < <(tr ',' '\n' <<< "${XRANDR_MONITOR[${VIDEO_PORT}]}") done fi -fi \ No newline at end of file +fi diff --git a/ublinux/rc.profile/03-profile-locale b/ublinux/rc.profile/03-profile-locale index 4908dca..27d656a 100755 --- a/ublinux/rc.profile/03-profile-locale +++ b/ublinux/rc.profile/03-profile-locale @@ -8,7 +8,6 @@ # Used as a source ENABLED=yes - #[[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } if [[ ${ENABLED} == "yes" ]]; then ## Если в профиле пользователя имеется файл "${XDG_CONFIG_HOME}/locale.conf" или "${HOME}/.config/locale.conf", diff --git a/ublinux/rc.profile/10-fixkeyboard_layout b/ublinux/rc.profile/10-fixkeyboard_layout index 6a8e5fe..1bd3c98 100755 --- a/ublinux/rc.profile/10-fixkeyboard_layout +++ b/ublinux/rc.profile/10-fixkeyboard_layout @@ -8,19 +8,20 @@ # Used as a source ENABLED=yes -[[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +#[[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +if [[ ${ENABLED} == "yes" ]]; then + DEFAULT_CONF=$(< /usr/lib/ublinux/default) + [[ ${DEFAULT_CONF} =~ (^|$'\n')[[:blank:]]*SYSCONF=([^$|$'\n']+)[[:blank:]]*($|$'\n') ]] && SYSCONF=${BASH_REMATCH[2]} || SYSCONF="/etc/sysconf" + [[ ${DEFAULT_CONF} =~ (^|$'\n')[[:blank:]]*NUMLOCK=([^$|$'\n']+)[[:blank:]]*($|$'\n') ]] && NUMLOCK=${BASH_REMATCH[2]} -DEFAULT_CONF=$(< /usr/lib/ublinux/default) -[[ ${DEFAULT_CONF} =~ (^|$'\n')[[:blank:]]*SYSCONF=([^$|$'\n']+)[[:blank:]]*($|$'\n') ]] && SYSCONF=${BASH_REMATCH[2]} || SYSCONF="/etc/sysconf" -[[ ${DEFAULT_CONF} =~ (^|$'\n')[[:blank:]]*NUMLOCK=([^$|$'\n']+)[[:blank:]]*($|$'\n') ]] && NUMLOCK=${BASH_REMATCH[2]} + SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + SOURCE=${SYSCONF}/keyboard; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=${SYSCONF}/keyboard; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + #Disable 2025-10-25 + #[[ ${RESETKBMODE} != @(no|disable) ]] && setxkbmap ${XKBLAYOUT} -model ${XKBMODEL} -option ${XKBOPTIONS} -#Disable 2025-10-25 -#[[ ${RESETKBMODE} != @(no|disable) ]] && setxkbmap ${XKBLAYOUT} -model ${XKBMODEL} -option ${XKBOPTIONS} - -# Automatic detection PC/notebooks -[[ -z ${NUMLOCK} ]] && { xinput list 2>/dev/null | grep -qi "touchpad" && NUMLOCK=no || NUMLOCK=yes; } -[[ ${NUMLOCK} == @(yes|on|enable) ]] && numlockx on -[[ ${NUMLOCK} == @(no|off|disable) ]] && numlockx off + # Automatic detection PC/notebooks + [[ -z ${NUMLOCK} ]] && { xinput list 2>/dev/null | grep -qi "touchpad" && NUMLOCK=no || NUMLOCK=yes; } + [[ ${NUMLOCK} == @(yes|on|enable) ]] && numlockx on + [[ ${NUMLOCK} == @(no|off|disable) ]] && numlockx off +fi diff --git a/ublinux/rc.profile/20-video-xorg-dpi b/ublinux/rc.profile/20-video-xorg-dpi index d467ded..2153d1d 100755 --- a/ublinux/rc.profile/20-video-xorg-dpi +++ b/ublinux/rc.profile/20-video-xorg-dpi @@ -8,107 +8,109 @@ # Used as a source ENABLED=yes -[[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +#[[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +if [[ ${ENABLED} == "yes" ]]; then -DEFAULT_CONF=$(< /usr/lib/ublinux/default) -[[ ${DEFAULT_CONF} =~ (^|$'\n')[[:blank:]]*SYSCONF=([^$|$'\n']+)[[:blank:]]*($|$'\n') ]] && SYSCONF=${BASH_REMATCH[2]} || SYSCONF="/etc/sysconf" + DEFAULT_CONF=$(< /usr/lib/ublinux/default) + [[ ${DEFAULT_CONF} =~ (^|$'\n')[[:blank:]]*SYSCONF=([^$|$'\n']+)[[:blank:]]*($|$'\n') ]] && SYSCONF=${BASH_REMATCH[2]} || SYSCONF="/etc/sysconf" -SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=${SYSCONF}/video; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=${SYSCONF}/desktop; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + SOURCE=${SYSCONF}/video; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + SOURCE=${SYSCONF}/desktop; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -xfce4_hidpi(){ - [[ -x /usr/bin/startxfce4 ]] || return 0 - if [[ $1 == @(enable|on) ]]; then - xfconf-query --channel xsettings --property /Gdk/WindowScalingFactor --create --type int --set "${SCALE}" - xfconf-query --channel xsettings --property /Gtk/CursorThemeSize --create --type int --set "${MOUSE_CURSOR}" - xfconf-query --channel xsettings --property /Xft/DPI --create --type int --set "${XORG_DPI}" - xfconf-query --channel xfwm4 --property /general/theme --create --type string --set "Default-xhdpi" - elif [[ $1 == @(disable|off) ]]; then - xfconf-query --channel xsettings --property /Gdk/WindowScalingFactor --reset - xfconf-query --channel xfwm4 --property /general/theme --reset - xfconf-query --channel xsettings --property /Gtk/CursorThemeSize --reset - xfconf-query --channel xsettings --property /Xft/DPI --reset - fi -} -plasma_hidpi(){ - [[ -x /usr/bin/plasmashell ]] || return 0 - if [[ $1 == @(enable|on) ]]; then - kwriteconfig5 --file kcmfonts --group General --key forceFontDPI "${XORG_DPI}" - kwriteconfig5 --file kcminputrc --group Mouse --key cursorSize "${MOUSE_CURSOR}" - kwriteconfig5 --file kdeglobals --group KScreen --key ScaleFactor "${SCALE}" - kwriteconfig5 --file kdeglobals --group KScreen --key ScreenScaleFactors "${SCALE};${SCALE};${SCALE};${SCALE};" - # ScreenScaleFactors "DP1=2;HDMI1=2;HDMI2=2;VIRTUAL1=2;" - elif [[ $1 == @(disable|off) ]]; then - kwriteconfig5 --file kcmfonts --group General --key forceFontDPI --delete - kwriteconfig5 --file kcminputrc --group Mouse --key cursorSize --delete - kwriteconfig5 --file kdeglobals --group KScreen --key ScaleFactor --delete - kwriteconfig5 --file kdeglobals --group KScreen --key ScreenScaleFactors --delete - fi -} -gnome_hidpi(){ - [[ -x /usr/bin/startgnome ]] || return 0 - if [[ $1 == @(enable|on) ]]; then - true - elif [[ $1 == @(disable|off) ]]; then - true - fi -} -lxde_hidpi(){ - [[ -x /usr/bin/startlxde ]] || return 0 - if [[ $1 == @(enable|on) ]]; then - true - elif [[ $1 == @(disable|off) ]]; then - true - fi -} -lxqt_hidpi(){ - [[ -x /usr/bin/startlxqt ]] || return 0 - if [[ $1 == @(enable|on) ]]; then - true - elif [[ $1 == @(disable|off) ]]; then - true - fi -} -mate_hidpi(){ - [[ -x /usr/bin/startmate ]] || return 0 - if [[ $1 == @(enable|on) ]]; then - true - elif [[ $1 == @(disable|off) ]]; then - true - fi -} + xfce4_hidpi(){ + [[ -x /usr/bin/startxfce4 ]] || return 0 + if [[ $1 == @(enable|on) ]]; then + xfconf-query --channel xsettings --property /Gdk/WindowScalingFactor --create --type int --set "${SCALE}" + xfconf-query --channel xsettings --property /Gtk/CursorThemeSize --create --type int --set "${MOUSE_CURSOR}" + xfconf-query --channel xsettings --property /Xft/DPI --create --type int --set "${XORG_DPI}" + xfconf-query --channel xfwm4 --property /general/theme --create --type string --set "Default-xhdpi" + elif [[ $1 == @(disable|off) ]]; then + xfconf-query --channel xsettings --property /Gdk/WindowScalingFactor --reset + xfconf-query --channel xfwm4 --property /general/theme --reset + xfconf-query --channel xsettings --property /Gtk/CursorThemeSize --reset + xfconf-query --channel xsettings --property /Xft/DPI --reset + fi + } + plasma_hidpi(){ + [[ -x /usr/bin/plasmashell ]] || return 0 + if [[ $1 == @(enable|on) ]]; then + kwriteconfig5 --file kcmfonts --group General --key forceFontDPI "${XORG_DPI}" + kwriteconfig5 --file kcminputrc --group Mouse --key cursorSize "${MOUSE_CURSOR}" + kwriteconfig5 --file kdeglobals --group KScreen --key ScaleFactor "${SCALE}" + kwriteconfig5 --file kdeglobals --group KScreen --key ScreenScaleFactors "${SCALE};${SCALE};${SCALE};${SCALE};" + # ScreenScaleFactors "DP1=2;HDMI1=2;HDMI2=2;VIRTUAL1=2;" + elif [[ $1 == @(disable|off) ]]; then + kwriteconfig5 --file kcmfonts --group General --key forceFontDPI --delete + kwriteconfig5 --file kcminputrc --group Mouse --key cursorSize --delete + kwriteconfig5 --file kdeglobals --group KScreen --key ScaleFactor --delete + kwriteconfig5 --file kdeglobals --group KScreen --key ScreenScaleFactors --delete + fi + } + gnome_hidpi(){ + [[ -x /usr/bin/startgnome ]] || return 0 + if [[ $1 == @(enable|on) ]]; then + true + elif [[ $1 == @(disable|off) ]]; then + true + fi + } + lxde_hidpi(){ + [[ -x /usr/bin/startlxde ]] || return 0 + if [[ $1 == @(enable|on) ]]; then + true + elif [[ $1 == @(disable|off) ]]; then + true + fi + } + lxqt_hidpi(){ + [[ -x /usr/bin/startlxqt ]] || return 0 + if [[ $1 == @(enable|on) ]]; then + true + elif [[ $1 == @(disable|off) ]]; then + true + fi + } + mate_hidpi(){ + [[ -x /usr/bin/startmate ]] || return 0 + if [[ $1 == @(enable|on) ]]; then + true + elif [[ $1 == @(disable|off) ]]; then + true + fi + } if [[ -n ${XORG_DPI} ]]; then - if [[ ${XORG_DPI} == @(no|disable) ]]; then - xfce4_hidpi disable - plasma_hidpi disable - gnome_hidpi disable - lxde_hidpi disable - lxqt_hidpi disable - mate_hidpi disable - return 0 - elif [[ ${XORG_DPI} == auto ]]; then - XORG_DPI=192 - MOUSE_CURSOR=48 - SCALE=2 - elif [[ ${XORG_DPI} == @(192|4K) ]]; then - XORG_DPI=192 - MOUSE_CURSOR=48 - SCALE=2 - elif [[ ${XORG_DPI} == @(144|2K) ]]; then - XORG_DPI=144 - MOUSE_CURSOR=32 - SCALE=1.5 - else - # Пользовательское значение XORG_DPI, остальные велечины высчитываются - MOUSE_CURSOR=28 - SCALE=1 - fi - xfce4_hidpi enable - plasma_hidpi enable - gnome_hidpi enable - lxde_hidpi enable - lxqt_hidpi enable - mate_hidpi enable + if [[ ${XORG_DPI} == @(no|disable) ]]; then + xfce4_hidpi disable + plasma_hidpi disable + gnome_hidpi disable + lxde_hidpi disable + lxqt_hidpi disable + mate_hidpi disable + return 0 + elif [[ ${XORG_DPI} == auto ]]; then + XORG_DPI=192 + MOUSE_CURSOR=48 + SCALE=2 + elif [[ ${XORG_DPI} == @(192|4K) ]]; then + XORG_DPI=192 + MOUSE_CURSOR=48 + SCALE=2 + elif [[ ${XORG_DPI} == @(144|2K) ]]; then + XORG_DPI=144 + MOUSE_CURSOR=32 + SCALE=1.5 + else + # Пользовательское значение XORG_DPI, остальные велечины высчитываются + MOUSE_CURSOR=28 + SCALE=1 + fi + xfce4_hidpi enable + plasma_hidpi enable + gnome_hidpi enable + lxde_hidpi enable + lxqt_hidpi enable + mate_hidpi enable fi +fi diff --git a/ublinux/rc.profile/50-domain_join b/ublinux/rc.profile/50-domain_join index 80381d6..2fe840d 100755 --- a/ublinux/rc.profile/50-domain_join +++ b/ublinux/rc.profile/50-domain_join @@ -8,37 +8,36 @@ # Used as a source ENABLED=yes -[[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } - -DEFAULT_CONF=$(< /usr/lib/ublinux/default) -[[ ${DEFAULT_CONF} =~ (^|$'\n')[[:blank:]]*SYSCONF=([^$|$'\n']+)[[:blank:]]*($|$'\n') ]] && SYSCONF=${BASH_REMATCH[2]} || SYSCONF="/etc/sysconf" - -SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null -SOURCE=${SYSCONF}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null - - -if [[ ! -z ${ADSERVER} ]]; then - - export PATH=$PATH:/usr/lib/ublinux/scripts:/opt/secretnet/sbin:/opt/secretnet/bin:/usr/lib/qt4/bin - - # Time synchronization - systemctl stop ntpd - /usr/sbin/ntpdate ${ADSERVER} >/dev/null 2>&1 - systemctl start ntpd - - [[ -f /usr/share/ublinux/ad_join/ad_join.pl ]] && ! echo -e "\n\n\n" | net ads testjoin; then - /usr/share/ublinux/ad_join/ad_join.pl - fi - - xsetroot -cursor_name left_ptr - systemctl restart smb - systemctl restart winbind - - # launch some rc scripts - for SELECT_SCRIPT in /usr/lib/ublinux/rc.domain/* ;do - [[ -x ${SELECT_SCRIPT} ]] && ${SELECT_SCRIPT} - done - for SELECT_SCRIPT in /usr/lib/ublinux/rc.domain.d/* ;do - [[ -x ${SELECT_SCRIPT} ]] && ${SELECT_SCRIPT} & - done +#[[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +if [[ ${ENABLED} == "yes" ]]; then + + DEFAULT_CONF=$(< /usr/lib/ublinux/default) + [[ ${DEFAULT_CONF} =~ (^|$'\n')[[:blank:]]*SYSCONF=([^$|$'\n']+)[[:blank:]]*($|$'\n') ]] && SYSCONF=${BASH_REMATCH[2]} || SYSCONF="/etc/sysconf" + + SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + SOURCE=${SYSCONF}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + + if [[ ! -z ${ADSERVER} ]]; then + export PATH=$PATH:/usr/lib/ublinux/scripts:/opt/secretnet/sbin:/opt/secretnet/bin:/usr/lib/qt4/bin + + # Time synchronization + systemctl stop ntpd + /usr/sbin/ntpdate ${ADSERVER} >/dev/null 2>&1 + systemctl start ntpd + + if [[ -f /usr/share/ublinux/ad_join/ad_join.pl ]] && ! echo -e "\n\n\n" | net ads testjoin; then + /usr/share/ublinux/ad_join/ad_join.pl + fi + xsetroot -cursor_name left_ptr + systemctl restart smb + systemctl restart winbind + + # launch some rc scripts + for SELECT_SCRIPT in /usr/lib/ublinux/rc.domain/*; do + [[ -x ${SELECT_SCRIPT} ]] && ${SELECT_SCRIPT} + done + for SELECT_SCRIPT in /usr/lib/ublinux/rc.domain.d/*; do + [[ -x ${SELECT_SCRIPT} ]] && ${SELECT_SCRIPT} & + done + fi fi diff --git a/ublinux/rc.profile/90-secretnet b/ublinux/rc.profile/90-secretnet index e3dcfde..819ded0 100755 --- a/ublinux/rc.profile/90-secretnet +++ b/ublinux/rc.profile/90-secretnet @@ -8,17 +8,18 @@ # Used as a source ENABLED=yes -[[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +#[[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } +if [[ ${ENABLED} == "yes" ]]; then + SNLIBS=/opt/secretnet/lib -SNLIBS=/opt/secretnet/lib + if [[ -d "${SNLIBS}" ]]; then + getent group snlogger || addgroup snlogger + getent group snadmin || addgroup snadmin + ldconfig $SNLIBS + systemctl is-active sn >/dev/null || systemctl restart sn -if [[ -d "${SNLIBS}" ]]; then - getent group snlogger || addgroup snlogger - getent group snadmin || addgroup snadmin - ldconfig $SNLIBS - systemctl is-active sn >/dev/null || systemctl restart sn - - export PATH=${PATH}:/usr/lib/ublinux/scripts:/opt/secretnet/sbin:/opt/secretnet/bin:/usr/lib/qt4/bin - /opt/secretnet/bin/snaidectl -i - /opt/secretnet/sbin/snunblock + export PATH=${PATH}:/usr/lib/ublinux/scripts:/opt/secretnet/sbin:/opt/secretnet/bin:/usr/lib/qt4/bin + /opt/secretnet/bin/snaidectl -i + /opt/secretnet/sbin/snunblock + fi fi diff --git a/ublinux/scripts/grub-functions b/ublinux/scripts/grub-functions index ea7be81..96e4a62 100755 --- a/ublinux/scripts/grub-functions +++ b/ublinux/scripts/grub-functions @@ -9,8 +9,6 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || { return 0 2>/dev/null && return 0 || exit 0; } -SELF_NAME="grub-functions" - PATH_GRUB="/memory/data/from/0/boot/grub/" exec_get_all_menuentry2(){