Many fix and new functions

master
Dmitry Razumov 2 years ago
parent ca8e91fa59
commit f72b7599c0
Signed by: asmeron
GPG Key ID: 50BC1DB583B79706

@ -127,7 +127,6 @@ KEYBOARD=ru
KEYTABLE=ru4 KEYTABLE=ru4
#STEAMNODPMS=yes #STEAMNODPMS=yes
#/rc.preinit/10-accounts #/rc.preinit/10-accounts
DEFAULTPASSWD='$6$E7stRhRS8fCKk7UU$Qoqw62AUaUa5uLIc2KC7WV3MUThhrR8kjXtCODmnKCzKe2zHu1/wmsiWBHZEIk/IQnk/aELQYbUK93OUtrwg60' DEFAULTPASSWD='$6$E7stRhRS8fCKk7UU$Qoqw62AUaUa5uLIc2KC7WV3MUThhrR8kjXtCODmnKCzKe2zHu1/wmsiWBHZEIk/IQnk/aELQYbUK93OUtrwg60'
DEFAULTROOTPASSWD='$6$E7stRhRS8fCKk7UU$Qoqw62AUaUa5uLIc2KC7WV3MUThhrR8kjXtCODmnKCzKe2zHu1/wmsiWBHZEIk/IQnk/aELQYbUK93OUtrwg60' DEFAULTROOTPASSWD='$6$E7stRhRS8fCKk7UU$Qoqw62AUaUa5uLIc2KC7WV3MUThhrR8kjXtCODmnKCzKe2zHu1/wmsiWBHZEIk/IQnk/aELQYbUK93OUtrwg60'
@ -140,7 +139,7 @@ ADMUID=1000
ADDADM=yes ADDADM=yes
#/rc.preinit/10-accounts #/rc.preinit/10-accounts
HASHPASSWD=sha512crypt HASHPASSWD=yescrypt
#/rc.preinit/50-xorg #/rc.preinit/50-xorg
#NVIDIATEST="nvidia-current nvidia340 nvidia304 nvidia" #NVIDIATEST="nvidia-current nvidia340 nvidia304 nvidia"
@ -160,7 +159,7 @@ CONSOLE_KEYMAP=ru
CONSOLE_KEYMAP_TOGGLE="grp:lctrl_lshift_toggle" CONSOLE_KEYMAP_TOGGLE="grp:lctrl_lshift_toggle"
#/rc.preinit.d/20-services #/rc.preinit.d/20-services
SERVICESSTART=dbus-broker,NetworkManager,sshd,systemd-swap,systemd-timesyncd,cups,cockpit.socket,avahi-daemon,avahi-dnsconfd,veyon,smb,nmb,winbind,bluetooth SERVICES_ENABLE=dbus-broker,NetworkManager,sshd,systemd-swap,systemd-timesyncd,cups,cockpit.socket,avahi-daemon,avahi-dnsconfd,veyon,smb,nmb,winbind,bluetooth
#/rc.preinit.d/23-publicdir #/rc.preinit.d/23-publicdir
# Папка с правами 777 доступная всем локальным пользователям и при разрешении всем из сети # Папка с правами 777 доступная всем локальным пользователям и при разрешении всем из сети
@ -190,6 +189,12 @@ HWCLOCK_SYNC=utc
#/rc.preinit.d/10-system #/rc.preinit.d/10-system
ZONE=Etc/UTC ZONE=Etc/UTC
#/rc.preinit.d/01-depmod
DEPMOD=yes
#/rc.preinit.d/03-ldconfig
RUNLDCONFIG=yes
#/rc.preinit.d/52-desktop #/rc.preinit.d/52-desktop
#/rc.post.d/02-hwclock #/rc.post.d/02-hwclock
#/rc.post.d/11-xorg #/rc.post.d/11-xorg

@ -163,8 +163,9 @@ echodebug(){
# $2 = output filesystem module file # $2 = output filesystem module file
# $3..$9 = optional arguments like -keep-as-directory or -b 123456789 # $3..$9 = optional arguments like -keep-as-directory or -b 123456789
create_module(){ create_module(){
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
. /etc/ublinux/config 2>/dev/null . /etc/ublinux/config 2>/dev/null
. /etc/ublinux/system 2>/dev/null
echo " $@ " | egrep -q ' -comp | -noD ' && MKSQFS_OPTS= echo " $@ " | egrep -q ' -comp | -noD ' && MKSQFS_OPTS=
mksquashfs "$1" "$2" $MKSQFS_OPTS $3 $4 $5 $6 $7 $8 $9 -noappend >/dev/null || return 1 mksquashfs "$1" "$2" $MKSQFS_OPTS $3 $4 $5 $6 $7 $8 $9 -noappend >/dev/null || return 1
chmod 444 "$2" chmod 444 "$2"
@ -263,7 +264,7 @@ xss_slideshow(){
} }
xss_heartbeat(){ xss_heartbeat(){
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
. /etc/ublinux/config 2>/dev/null . /etc/ublinux/config 2>/dev/null
SSAVERBLOCKAPPS="$(echo "$SSAVERBLOCKAPPS"| tr ',; ' '|' )" SSAVERBLOCKAPPS="$(echo "$SSAVERBLOCKAPPS"| tr ',; ' '|' )"
bash -c "while true ;do top -bn1 -u $(id -un) | awk '{ print \$7 FS \$NF }' | grep ^[1-9] | egrep -q \"$SSAVERBLOCKAPPS\" && xscreensaver-command -deactivate >/dev/null ; sleep 20s ; done " & bash -c "while true ;do top -bn1 -u $(id -un) | awk '{ print \$7 FS \$NF }' | grep ^[1-9] | egrep -q \"$SSAVERBLOCKAPPS\" && xscreensaver-command -deactivate >/dev/null ; sleep 20s ; done " &

@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
NOEXEC="i3term:xbindkeys;i3term:fusion-icon;i3term:ublinuxupdate" NOEXEC="i3term:xbindkeys;i3term:fusion-icon;i3term:ublinuxupdate"
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -2,7 +2,7 @@
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -2,7 +2,7 @@
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -4,7 +4,7 @@ ENABLED=yes
[[ ${ENABLED} != yes ]] && exit 0 [[ ${ENABLED} != yes ]] && exit 0
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/desktop; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/desktop; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
@ -58,8 +58,8 @@ exec_autoexec_remove(){
if [[ -z $@ || $1 == set ]]; then if [[ -z $@ || $1 == set ]]; then
shift shift
exec_autoexec_set $@ exec_autoexec_set $@
KERNEL_AUTOEXEC=$(cmdline_value autoexec) KERNEL_AUTOEXEC="$(cmdline_value autoexec)"
[[ ${KERNEL_AUTOEXEC} == "" ]] || exec_autoexec_set set AUTOEXEC=${KERNEL_AUTOEXEC} [[ -n ${KERNEL_AUTOEXEC} ]] && exec_autoexec_set AUTOEXEC="${KERNEL_AUTOEXEC}"
elif [[ $1 == remove ]]; then elif [[ $1 == remove ]]; then
shift shift
exec_autoexec_remove $@ exec_autoexec_remove $@

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
# Фиксим ~/.config/gtk-3.0/bookmarks подставляя тукущего пользователя вместо ${USER} # Фиксим ~/.config/gtk-3.0/bookmarks подставляя тукущего пользователя вместо ${USER}

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
FUSIONICONTIMEOUT=5 FUSIONICONTIMEOUT=5
FUSIONICONDEDIS=gnome-shell,gnome,i3term FUSIONICONDEDIS=gnome-shell,gnome,i3term
[ -f /etc/ublinux/compositing-wm ] && . /etc/ublinux/compositing-wm [ -f /etc/ublinux/compositing-wm ] && . /etc/ublinux/compositing-wm
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -5,7 +5,7 @@ ENABLED=yes
unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=. unset ROOTFS; [[ -d /usr/lib/ublinux ]] || 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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"
SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
[ "$RUNLDCONFIG" != "yes" -a "$RUNLDCONFIG" != "no" ] && bash -c "sleep 30 && sudo /sbin/ldconfig" & [ "$RUNLDCONFIG" != "yes" -a "$RUNLDCONFIG" != "no" ] && bash -c "sleep 30 && sudo /sbin/ldconfig" &

@ -1,11 +1,11 @@
#!/bin/sh #!/bin/sh
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
XDG_DESKTOP_DIR="$HOME/Рабочий стол" XDG_DESKTOP_DIR="$HOME/Рабочий стол"
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
[ -z "$PLACEONDESKTOP" ] && exit 0 [ -z "$PLACEONDESKTOP" ] && exit 0

@ -1,9 +1,16 @@
#!/bin/sh #!/bin/sh
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no
. /usr/lib/ublinux/functions
. /usr/lib/ublinux/default
debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/hardware; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
. /usr/lib/ublinux/os-config
[ -f /etc/sound/profiles/current/profile.conf ] && . /etc/sound/profiles/current/profile.conf [ -f /etc/sound/profiles/current/profile.conf ] && . /etc/sound/profiles/current/profile.conf
[ "$SOUNDPROFILE" = "pulse" -a "$PULSEAUDIOSTART" != "no" ] && start-pulseaudio-x11 & [ "$SOUNDPROFILE" = "pulse" -a "$PULSEAUDIOSTART" != "no" ] && start-pulseaudio-x11 &

@ -3,10 +3,10 @@
[ -f ~/.config/tox/qtox.ini ] && exit 0 [ -f ~/.config/tox/qtox.ini ] && exit 0
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions

@ -1,7 +1,15 @@
#!/bin/bash #!/bin/bash
# Description: This script ask user for update system # Description: This script ask user for update system
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no
. /usr/lib/ublinux/functions
. /usr/lib/ublinux/default
debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/update; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
function stopstatus() function stopstatus()
@ -86,7 +94,7 @@ export TEXTDOMAIN=ublinux_functions
echo $PATH | grep -q /usr/lib/ublinux/scripts || PATH=/usr/lib/ublinux/scripts:$PATH echo $PATH | grep -q /usr/lib/ublinux/scripts || PATH=/usr/lib/ublinux/scripts:$PATH
. /etc/os-release . /etc/os-release
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
DEBUGMODE=no DEBUGMODE=no
debug_mode "$0" "$@" debug_mode "$0" "$@"

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
[ "$XBINDKEYSSTART" = "yes" ] && xbindkeys $XBINDKEYSOPTIONS & [ "$XBINDKEYSSTART" = "yes" ] && xbindkeys $XBINDKEYSOPTIONS &

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# xscreensaver helper scripts # xscreensaver helper scripts
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
XSSHBTM=20s XSSHBTM=20s
# exit for DE # exit for DE
@ -14,7 +14,7 @@ XSSBLRUNED="kscreenlocker"
XSSBLLOADED="media-play,mplayer,tvtime,firefox,steam,chromium" XSSBLLOADED="media-play,mplayer,tvtime,firefox,steam,chromium"
/usr/lib/ublinux/functions /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -4,9 +4,9 @@
# #
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
EXCLUSIVEAPP=remmina EXCLUSIVEAPP=remmina
TERMMODEEXIT="i3-msg exit" TERMMODEEXIT="i3-msg exit"
TERMMODSCRIPTPRE= TERMMODSCRIPTPRE=
TERMMODETIMEOUT=15 TERMMODETIMEOUT=15
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -5,7 +5,7 @@ ENABLED=yes
unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=. unset ROOTFS; [[ -d /usr/lib/ublinux ]] || 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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"
SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DOLPHINBOOKMARKS=.local/share/user-places.xbel DOLPHINBOOKMARKS=.local/share/user-places.xbel
HIDELOOP=255 HIDELOOP=255
HIDERAM=0 HIDERAM=0
HIDEZRAM=8 HIDEZRAM=8
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
[ "$HIDELOOP4DOLPHIN" = "no" ] && exit 0 [ "$HIDELOOP4DOLPHIN" = "no" ] && exit 0
if [ "$1" != "fork" ] ;then if [ "$1" != "fork" ] ;then

@ -1,11 +1,11 @@
#!/bin/sh #!/bin/sh
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
I3_NOTIFYD=yes I3_NOTIFYD=yes
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
[ "$MATEPAAGENTSTART" != "no" ] && /usr/lib64/polkit-mate-authentication-agent-1 & [ "$MATEPAAGENTSTART" != "no" ] && /usr/lib64/polkit-mate-authentication-agent-1 &

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
if [ ! -f $HOME/.config/Trolltech.conf ] ;then if [ ! -f $HOME/.config/Trolltech.conf ] ;then
[ -f /usr/share/lxqt/themes/Default/Trolltech.conf ] && cp /usr/share/lxqt/themes/Default/Trolltech.conf $HOME/.config/Trolltech.conf [ -f /usr/share/lxqt/themes/Default/Trolltech.conf ] && cp /usr/share/lxqt/themes/Default/Trolltech.conf $HOME/.config/Trolltech.conf

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
#. /etc/ublinux/config #. /etc/ublinux/config

@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
SOURCE=/usr/lib/ublinux/os-config; [[ -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}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/kiosk; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/kiosk; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -1,10 +1,10 @@
#!/bin/bash #!/bin/bash
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DOMUSGR=audio,video,usb,vboxusers,bumblebee,cdrom,cdwriter,lp,floppy DOMUSGR=audio,video,usb,vboxusers,bumblebee,cdrom,cdwriter,lp,floppy
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
#echo "Sleep 60 sec to reboot /proc/sysrq-trigger" #echo "Sleep 60 sec to reboot /proc/sysrq-trigger"
#echo 1 > /proc/sys/kernel/sysrq #echo 1 > /proc/sys/kernel/sysrq

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
#HALTPROCESSESKILL="slim kdm X lxdm xdm sddm cupsd pdnsd mc mandb" #HALTPROCESSESKILL="slim kdm X lxdm xdm sddm cupsd pdnsd mc mandb"
HALTPROCESSESKILL="" HALTPROCESSESKILL=""
@ -9,9 +9,10 @@ HALTSERVICESSTOP=""
HALTEXCLUDESTOP="" HALTEXCLUDESTOP=""
PATH=/usr/lib/ublinux/scripts:$PATH PATH=/usr/lib/ublinux/scripts:$PATH
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/system; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/desktop; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/desktop; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
# some cleanups # some cleanups
rm -fr /tmp/* /mnt/live/memory/changes/usr/share/apps/ksplash/Themes/Default 2>/dev/null rm -fr /tmp/* /mnt/live/memory/changes/usr/share/apps/ksplash/Themes/Default 2>/dev/null

@ -1,12 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=. unset ROOTFS; [[ -d /usr/lib/ublinux ]] || 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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -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" "$@" debug_mode "$0" "$@"
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"

@ -1,13 +1,14 @@
#!/bin/bash #!/bin/bash
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
#grep -q 1 /run/ublinux_started || exit 0 #grep -q 1 /run/ublinux_started || exit 0
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/system; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
SAVETOMODULEOPTIONS="$MKSQFS_FASTALG" SAVETOMODULEOPTIONS="$MKSQFS_FASTALG"

@ -1,9 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
SOURCE=/usr/lib/ublinux/os-config; [[ -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}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/save; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/save; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/network; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/network; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -1,12 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=. unset ROOTFS; [[ -d /usr/lib/ublinux ]] || 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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -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" "$@" debug_mode "$0" "$@"
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"

@ -1,11 +1,11 @@
#!/usr/bin/env bash #!/usr/bin/env bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
#grep -q 1 /run/ublinux_started || exit 0 #grep -q 1 /run/ublinux_started || exit 0
#. /usr/lib/ublinux/functions #. /usr/lib/ublinux/functions
#. /usr/lib/ublinux/os-config #. /usr/lib/ublinux/default
#SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null #SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
chmod_ublinux() { chmod_ublinux() {
local PATH_UBLINUX=$1 local PATH_UBLINUX=$1

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
PATH=/usr/lib/ublinux/scripts:${PATH} PATH=/usr/lib/ublinux/scripts:${PATH}
EXT="ubm" EXT="ubm"

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
PATH=/usr/lib/ublinux/scripts:$PATH PATH=/usr/lib/ublinux/scripts:$PATH

@ -3,7 +3,7 @@
ENABLED=yes ENABLED=yes
[[ ${ENABLED} != "yes" ]] && exit 0 [[ ${ENABLED} != "yes" ]] && exit 0
SOURCE=/usr/lib/ublinux/os-config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
SOURCE=${SYSCONF}/clock; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/clock; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
[[ ${HALTSAVETIME,,} =~ ^no$|^off$|^disable$ ]] && exit 0 [[ ${HALTSAVETIME,,} =~ ^no$|^off$|^disable$ ]] && exit 0

@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -1,14 +1,14 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
ALLOWEDSUDO=ldconfig,ubupdate,ntpdate ALLOWEDSUDO=ldconfig,ubupdate,ntpdate
PATH=/usr/lib/ublinux/scripts:/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/local/sbin: PATH=/usr/lib/ublinux/scripts:/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/local/sbin:
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
SNDMIX_MASTER_N=Master SNDMIX_MASTER_N=Master
@ -11,10 +11,11 @@ SNDMIX_SWITCH_ON="IEC958 Playback Default,IEC958 Playback Switch"
SNDMIX_SWITCH_OFF="Beep Playback Switch,Mic Playback Switch" SNDMIX_SWITCH_OFF="Beep Playback Switch,Mic Playback Switch"
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/hardware; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
# in case of card 0 is HDMI, card 1 is audiocard # in case of card 0 is HDMI, card 1 is audiocard
if [ "$SNDFINCARD" != "no" ] ;then if [ "$SNDFINCARD" != "no" ] ;then

@ -5,7 +5,7 @@ ENABLED=yes
DEBUGMODE=no DEBUGMODE=no
SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
SOURCE=/usr/lib/ublinux/os-config; [[ -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}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/desktop; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/desktop; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null

@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
SOURCE=/usr/lib/ublinux/os-config; [[ -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}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
debug_mode "$0" "$@" debug_mode "$0" "$@"

@ -1,13 +1,13 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
UPDATEGTKICONOPTS="-fit /usr/share/icons/hicolor" UPDATEGTKICONOPTS="-fit /usr/share/icons/hicolor"
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
#[ "$UPDATEGTKICONCACHE" != "no" ] && [ -d "/usr/share/icons/hicolor/" ] && gtk-update-icon-cache $UPDATEGTKICONOPTS >/dev/null 2>&1 #[ "$UPDATEGTKICONCACHE" != "no" ] && [ -d "/usr/share/icons/hicolor/" ] && gtk-update-icon-cache $UPDATEGTKICONOPTS >/dev/null 2>&1

@ -1,10 +1,10 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
#. /usr/lib/ublinux/functions #. /usr/lib/ublinux/functions
#. /usr/lib/ublinux/os-config #. /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
if [ -d "/usr/share/applications/" -o -d "/usr/local/share/applications/" ]; then if [ -d "/usr/share/applications/" -o -d "/usr/local/share/applications/" ]; then

@ -1,10 +1,10 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
#. /usr/lib/ublinux/functions #. /usr/lib/ublinux/functions
#. /usr/lib/ublinux/os-config #. /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
[ -d "/usr/share/glib-2.0/schemas/" ] && glib-compile-schemas /usr/share/glib-2.0/schemas/ [ -d "/usr/share/glib-2.0/schemas/" ] && glib-compile-schemas /usr/share/glib-2.0/schemas/

@ -1,10 +1,10 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
#. /usr/lib/ublinux/functions #. /usr/lib/ublinux/functions
#. /usr/lib/ublinux/os-config #. /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
[ -d "/usr/share/mime/" ] && update-mime-database /usr/share/mime [ -d "/usr/share/mime/" ] && update-mime-database /usr/share/mime

@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -5,7 +5,7 @@ ENABLED=yes
unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=. unset ROOTFS; [[ -d /usr/lib/ublinux ]] || 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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"
SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null

@ -1,10 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
debug_mode "$0" "$@" debug_mode "$0" "$@"

@ -1,10 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
#. /usr/lib/ublinux/functions #. /usr/lib/ublinux/functions
#. /usr/lib/ublinux/os-config #. /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"

@ -4,7 +4,7 @@
# #
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
#. /usr/lib/ublinux/functions #. /usr/lib/ublinux/functions
debug_mode "$0" "$@" debug_mode "$0" "$@"

@ -1,17 +1,12 @@
#!/bin/bash #!/bin/bash
#
# Initial script for Live operating system
# This script are launching before starting init from linux-live script.
# Current dir allways must be set to root (/)
# All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
#PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin #PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
DEBUGMODE=no DEBUGMODE=no
#. usr/lib/ublinux/functions #. usr/lib/ublinux/functions
#. usr/lib/ublinux/os-config #. usr/lib/ublinux/default
EULA_DB="/usr/share/ublinux/agreement/EULA_DB.txt" EULA_DB="/usr/share/ublinux/agreement/EULA_DB.txt"
EULA="/usr/share/ublinux/agreement/EULA.txt" EULA="/usr/share/ublinux/agreement/EULA.txt"
debug_mode "$0" "$@" debug_mode "$0" "$@"

@ -4,7 +4,7 @@
# #
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
#. /usr/lib/ublinux/functions #. /usr/lib/ublinux/functions
#debug_mode "$0" "$@" #debug_mode "$0" "$@"

@ -5,7 +5,7 @@ ENABLED=yes
DEBUGMODE=no DEBUGMODE=no
SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
SOURCE=/usr/lib/ublinux/os-config; [[ -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}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null

@ -2,7 +2,7 @@
# Description: This script will generate initial passwords for samba users # Description: This script will generate initial passwords for samba users
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
# Machine only # Machine only
@ -11,7 +11,7 @@ SMBUSERS=$(grep ^users: /etc/group | awk -F: '{print $4}' | tr ';,' ' ')
SMBGUEST="yes" SMBGUEST="yes"
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

@ -1,15 +1,15 @@
#!/bin/bash #!/bin/bash
# Description: This script will generate # Description: This script will generate
ENABLED= ENABLED=
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/update; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
echo $UBLINUXUPDATE | grep -qi ^auto$ || exit 0 echo $UBLINUXUPDATE | grep -qi ^auto$ || exit 0

@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
# sysctl variables # sysctl variables

@ -6,7 +6,7 @@ DEBUGMODE=no
unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=. unset ROOTFS; [[ -d /usr/lib/ublinux ]] || 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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -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" "$@" debug_mode "$0" "$@"
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"

@ -1,10 +1,10 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
[ "$MODPROBEPRELOAD" = "no" ] && exit 0 [ "$MODPROBEPRELOAD" = "no" ] && exit 0

@ -8,7 +8,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=. unset ROOTFS; [[ -d /usr/lib/ublinux ]] || 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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -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" "$@" debug_mode "$0" "$@"
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"

@ -43,11 +43,11 @@
## При запуске в ручную, получим изображения в каталоге: /tmp/ublinux_bg ## При запуске в ручную, получим изображения в каталоге: /tmp/ublinux_bg
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
@ -159,7 +159,7 @@ get_max_resolution() {
RESOLUTION=$(XAUTHORITY=${PATH_XAUTHORITY} xrandr -d $(ls /tmp/.X11-unix | tr 'X' ':' | head -n 1) 2>/dev/null | grep "*" | xargs | cut -d" " -f1) RESOLUTION=$(XAUTHORITY=${PATH_XAUTHORITY} xrandr -d $(ls /tmp/.X11-unix | tr 'X' ':' | head -n 1) 2>/dev/null | grep "*" | xargs | cut -d" " -f1)
# $(xrandr -d :0 --current | sed -n 's/.* connected \([0-9]*\)x\([0-9]*\)+.*/\1x\2/p') # $(xrandr -d :0 --current | sed -n 's/.* connected \([0-9]*\)x\([0-9]*\)+.*/\1x\2/p')
# Если не обнаружено ни одно разрешение, то статическое из os-config # Если не обнаружено ни одно разрешение, то статическое из /usr/lib/ublinux/default
[[ -z ${RESOLUTION} ]] && RESOLUTION=${BACKGROUND_RES} [[ -z ${RESOLUTION} ]] && RESOLUTION=${BACKGROUND_RES}
[[ -z ${RESOLUTION} ]] && RESOLUTION="1920x1080" [[ -z ${RESOLUTION} ]] && RESOLUTION="1920x1080"
} }

@ -5,7 +5,7 @@ ENABLED=yes
DEBUGMODE=no DEBUGMODE=no
SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
SOURCE=/usr/lib/ublinux/os-config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
debug_mode "$0" "$@" debug_mode "$0" "$@"
#. $HARDCONF #. $HARDCONF

@ -5,7 +5,7 @@ ENABLED=yes
DEBUGMODE=no DEBUGMODE=no
SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
SOURCE=/usr/lib/ublinux/os-config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
debug_mode "$0" "$@" debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null

@ -5,7 +5,7 @@ ENABLED=yes
DEBUGMODE=no DEBUGMODE=no
SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
SOURCE=/usr/lib/ublinux/os-config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
debug_mode "$0" "$@" debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null

@ -5,7 +5,7 @@ ENABLED=yes
DEBUGMODE=no DEBUGMODE=no
SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
SOURCE=/usr/lib/ublinux/os-config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
debug_mode "$0" "$@" debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null

@ -5,7 +5,7 @@ ENABLED=yes
DEBUGMODE=no DEBUGMODE=no
SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
SOURCE=/usr/lib/ublinux/os-config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
debug_mode "$0" "$@" debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions

@ -1,15 +1,16 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/mount; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
# Дирректория доступная всем локальным пользователям и при разрешении сетевым # Дирректория доступная всем локальным пользователям и при разрешении сетевым
#[ ! -z ${PUBLICDIR} ] && mkdir -p ${PUBLICDIR#/*} && chmod -R 2777 ${PUBLICDIR#/*} && chgrp -R 985 ${PUBLICDIR#/*} #[ ! -z ${PUBLICDIR} ] && mkdir -p ${PUBLICDIR#/*} && chmod -R 2777 ${PUBLICDIR#/*} && chgrp -R 985 ${PUBLICDIR#/*}

@ -1,11 +1,11 @@
#!/usr/bin/env bash #!/usr/bin/env bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
SOURCE=/usr/lib/ublinux/os-config; [[ -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}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null

@ -1,14 +1,15 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/hardware; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
[ -z "$PULSEAUDIO" ] && PULSEAUDIO=default [ -z "$PULSEAUDIO" ] && PULSEAUDIO=default

@ -1,14 +1,14 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
SELF_NAME="42-access-suid-sgid" SELF_NAME="42-access-suid-sgid"
unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=. unset ROOTFS; [[ -d /usr/lib/ublinux ]] || 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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -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" "$@" debug_mode "$0" "$@"
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"

@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=. unset ROOTFS; [[ -d /usr/lib/ublinux ]] || 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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -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" "$@" debug_mode "$0" "$@"
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"

@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=. unset ROOTFS; [[ -d /usr/lib/ublinux ]] || 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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -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" "$@" debug_mode "$0" "$@"
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"

@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=. unset ROOTFS; [[ -d /usr/lib/ublinux ]] || 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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -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" "$@" debug_mode "$0" "$@"
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"
@ -96,11 +96,11 @@ exec_disk_quota(){
true true
fi fi
if [[ -z ${ROOTFS} ]]; then if [[ -z ${ROOTFS} ]]; then
/usr/bin/ubconfig --quiet --source system get config SERVICESSTART | grep -q systemd-quotacheck 2>/dev/null \ /usr/bin/ubconfig --quiet --source system get system SERVICESSTART | grep -q systemd-quotacheck 2>/dev/null \
|| /usr/bin/ubconfig --quiet --target system set config SERVICESSTART+=,systemd-quotacheck || /usr/bin/ubconfig --quiet --target system set system SERVICESSTART+=,systemd-quotacheck
else else
chroot . /usr/bin/ubconfig --quiet --source system get config SERVICESSTART | grep -q systemd-quotacheck 2>/dev/null \ chroot . /usr/bin/ubconfig --quiet --source system get system SERVICESSTART | grep -q systemd-quotacheck 2>/dev/null \
|| /usr/bin/ubconfig --quiet --noexecute --target system set config SERVICESSTART+=,systemd-quotacheck || /usr/bin/ubconfig --quiet --noexecute --target system set system SERVICESSTART+=,systemd-quotacheck
fi fi
else else
[[ -n ${ISFS_EXT234} && ${ISFS_EXT234_FEATURES} == no ]] && ${ROOTFS}/usr/bin/tune2fs -Q ${MOUNT_DISK_ATTR[${PATH_DEVICE}]} ${PATH_DEVICE} #2>/dev/null [[ -n ${ISFS_EXT234} && ${ISFS_EXT234_FEATURES} == no ]] && ${ROOTFS}/usr/bin/tune2fs -Q ${MOUNT_DISK_ATTR[${PATH_DEVICE}]} ${PATH_DEVICE} #2>/dev/null
@ -113,9 +113,9 @@ exec_disk_quota(){
${ROOTFS}/usr/bin/quotaoff -${ARG_CMD} ${PATH_DEVICE} &>/dev/null ${ROOTFS}/usr/bin/quotaoff -${ARG_CMD} ${PATH_DEVICE} &>/dev/null
if [[ ${ATTR_QUOTA} == quota ]]; then if [[ ${ATTR_QUOTA} == quota ]]; then
if [[ -z ${ROOTFS} ]]; then if [[ -z ${ROOTFS} ]]; then
/usr/bin/ubconfig --quiet --target system set config SERVICESSTART--=,systemd-quotacheck /usr/bin/ubconfig --quiet --target system set system SERVICESSTART--=,systemd-quotacheck
else else
chroot . /usr/bin/ubconfig --quiet --noexecute --target system set config SERVICESSTART--=,systemd-quotacheck chroot . /usr/bin/ubconfig --quiet --noexecute --target system set system SERVICESSTART--=,systemd-quotacheck
fi fi
cat /proc/mounts | grep -q "${PATH_DEVICE}.*${ATTR_QUOTA}" && mount -o remount,noquota ${PATH_DEVICE} &>/dev/null cat /proc/mounts | grep -q "${PATH_DEVICE}.*${ATTR_QUOTA}" && mount -o remount,noquota ${PATH_DEVICE} &>/dev/null
fi fi
@ -277,7 +277,7 @@ exec_disk_quota(){
${ROOTFS}/usr/bin/quotaoff -augP 2>/dev/null ${ROOTFS}/usr/bin/quotaoff -augP 2>/dev/null
${ROOTFS}/usr/bin/quotacheck -aug 2>/dev/null ${ROOTFS}/usr/bin/quotacheck -aug 2>/dev/null
${ROOTFS}/usr/bin/quotaon -augP 2>/dev/null ${ROOTFS}/usr/bin/quotaon -augP 2>/dev/null
#${ROOTFS}/usr/bin/ubconfig --quiet set config SERVICESSTART+=,quotaon.service #${ROOTFS}/usr/bin/ubconfig --quiet set system SERVICESSTART+=,quotaon.service
fi fi
elif [[ ${ALL_VALUE_QUOTA,,} == disable ]]; then elif [[ ${ALL_VALUE_QUOTA,,} == disable ]]; then
@ -286,7 +286,7 @@ exec_disk_quota(){
else else
disable_quota disable_quota
${ROOTFS}/usr/bin/quotaoff -augP 2>/dev/null ${ROOTFS}/usr/bin/quotaoff -augP 2>/dev/null
#${ROOTFS}/usr/bin/ubconfig --quiet set config SERVICESSTART--=,quotaon.service #${ROOTFS}/usr/bin/ubconfig --quiet set system SERVICESSTART--=,quotaon.service
fi fi
elif [[ ${ALL_VALUE_QUOTA,,} == clean ]]; then elif [[ ${ALL_VALUE_QUOTA,,} == clean ]]; then
[[ -n ${PATH_DEVICE} ]] && clean_quota [[ -n ${PATH_DEVICE} ]] && clean_quota

@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=. unset ROOTFS; [[ -d /usr/lib/ublinux ]] || 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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -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" "$@" debug_mode "$0" "$@"
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"
@ -63,8 +63,8 @@ exec_cgroup_quota_remove(){
if [[ -z $@ || $1 == set ]]; then if [[ -z $@ || $1 == set ]]; then
shift shift
exec_cgroup_quota_set $@ exec_cgroup_quota_set "$@"
elif [[ $1 == remove ]]; then elif [[ $1 == remove ]]; then
shift shift
exec_cgroup_quota_remove $@ exec_cgroup_quota_remove "$@"
fi fi

@ -1,10 +1,10 @@
#!/bin/bash #!/bin/bash
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
#. /usr/lib/ublinux/functions #. /usr/lib/ublinux/functions
#. /usr/lib/ublinux/os-config #. /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
#for font_dir in /usr/share/fonts{,/default}/TTF /usr/X11R6/lib/X11/fonts/TTF; do #for font_dir in /usr/share/fonts{,/default}/TTF /usr/X11R6/lib/X11/fonts/TTF; do

@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
DIRGTK=gtk-2.0 DIRGTK=gtk-2.0

@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
WHITELISTMODULES="$(cmdline_value whitelist | tr ',;' ' ')" WHITELISTMODULES="$(cmdline_value whitelist | tr ',;' ' ')"

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
if [ -d /var/opt/kaspersky ] ;then if [ -d /var/opt/kaspersky ] ;then
if [ -d /mnt/livedata/ublinux-data ] ;then if [ -d /mnt/livedata/ublinux-data ] ;then

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
debug_mode "$0" "$@" debug_mode "$0" "$@"

@ -1,10 +1,10 @@
#!/bin/bash #!/bin/bash
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
. /usr/lib/ublinux/functions . /usr/lib/ublinux/functions
. /usr/lib/ublinux/os-config . /usr/lib/ublinux/default
SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
debug_mode "$0" "$@" debug_mode "$0" "$@"

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
debug_mode "$0" "$@" debug_mode "$0" "$@"

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
debug_mode "$0" "$@" debug_mode "$0" "$@"

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# Initial script for Linux Live operating system # Initial script for Linux UBLinux
# This script are launching before starting init from linux-live script. # This script are launching before starting init from initrd script
# Current dir allways must be set to root (/) # Current dir allways must be set to root (/)
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
@ -11,14 +11,16 @@ DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=. [[ -d /usr/lib/ublinux ]] && { unset ROOTFS; unset CMD_CHROOT; } || { ROOTFS="/sysroot"; 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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -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" "$@" debug_mode "$0" "$@"
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"
SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/hardware; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
[[ $(cmdline_parameter depmod) ]] && DEPMOD="yes"
[[ ${DEPMOD} = "yes" ]] && chroot . usr/bin/depmod -a [[ $(cmdline_parameter depmod) ]] && DEPMOD="yes"
[[ ${DEPMOD} == @(yes|y) ]] && ${CMD_CHROOT} usr/bin/depmod -a

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# Initial script for Linux Live operating system # Initial script for Linux UBLinux
# This script are launching before starting init from linux-live script. # This script are launching before starting init from initrd script
# Current dir allways must be set to root (/) # Current dir allways must be set to root (/)
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
@ -11,7 +11,7 @@ DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
. usr/lib/ublinux/functions . usr/lib/ublinux/functions
. usr/lib/ublinux/os-config . usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"

@ -4,12 +4,13 @@ ENABLED=yes
[[ ${ENABLED} == "yes" ]] || exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
. usr/lib/ublinux/functions [[ -d /usr/lib/ublinux ]] && { unset ROOTFS; unset CMD_CHROOT; } || { ROOTFS="/sysroot"; CMD_CHROOT="chroot ${ROOTFS}"; }
. usr/lib/ublinux/os-config 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" "$@" debug_mode "$0" "$@"
echo $SYSCONF | grep -q ^/ && SYSCONF=.$SYSCONF SYSCONF="${ROOTFS}/${SYSCONF}"
SOURCE=${SYSCONF}/config; [ -f "${SOURCE}" ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/hardware; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
#[ "$RUNLDCONFIG" = "yes" ] && /usr/bin/ldconfig [[ ${RUNLDCONFIG} == @(yes|y) ]] && ${CMD_CHROOT} /usr/bin/ldconfig 2>&1 &>/dev/null
chroot . /usr/bin/ldconfig 2>&1 &>/dev/null

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# Initial script for Live operating system # Initial script for UBLinux
# This script are launching before starting init from linux-live script. # This script are launching before starting init from initrd script
# Current dir allways must be set to root (/) # Current dir allways must be set to root (/)
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
@ -13,12 +13,13 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
[[ -d /usr/lib/ublinux ]] && { unset ROOTFS; unset CMD_CHROOT; } || { ROOTFS="/sysroot"; CMD_CHROOT="chroot ${ROOTFS}"; } [[ -d /usr/lib/ublinux ]] && { unset ROOTFS; unset CMD_CHROOT; } || { ROOTFS="/sysroot"; 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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -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" "$@" debug_mode "$0" "$@"
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"
SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/system; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/system; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/hardware; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/clock; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/clock; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
exec_linklivedata(){ exec_linklivedata(){

@ -1,22 +1,23 @@
#!/bin/bash #!/bin/bash
# #
# Initial script for Live operating system # Initial script for UBLinux
# This script are launching before starting init from linux-live script. # This script are launching before starting init from initrd script
# Current dir allways must be set to root (/) # Current dir allways must be set to root (/)
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
DEBUGMODE=no DEBUGMODE=no
#. usr/lib/ublinux/scripts/liblinuxlive #. usr/lib/ublinux/scripts/liblinuxlive
. usr/lib/ublinux/functions . usr/lib/ublinux/functions
. usr/lib/ublinux/os-config . usr/lib/ublinux/default
debug_mode "$0" "$@" debug_mode "$0" "$@"
echo $SYSCONF | grep -q ^/ && SYSCONF=.$SYSCONF echo $SYSCONF | grep -q ^/ && SYSCONF=.$SYSCONF
SOURCE=${SYSCONF}/config; [ -f "${SOURCE}" ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [ -f "${SOURCE}" ] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/mount; [ -f "${SOURCE}" ] && . ${SOURCE} 2>/dev/null
get_name() get_name()
{ {

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# Initial script for Live operating system # Initial script for UBLinux
# This script are launching before starting init from linux-live script. # This script are launching before starting init from initrd script
# Current dir allways must be set to root (/) # Current dir allways must be set to root (/)
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# Initial script for Live operating system # Initial script for UBLinux
# This script are launching before starting init from linux-live script. # This script are launching before starting init from initrd script
# Current dir allways must be set to root (/) # Current dir allways must be set to root (/)
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs

@ -1,49 +1,227 @@
#!/usr/bin/env bash #!/bin/bash
# #
# Initial script for Live operating system # Initial script for UBLinux
# This script are launching before starting init from linux-live script. # This script are launching before starting init from initrd script
# Current dir allways must be set to root (/) # Current dir allways must be set to root (/)
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[[ ${ENABLED} == "yes" ]] || exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
DEBUGMODE=no
. usr/lib/ublinux/functions [[ -d /usr/lib/ublinux ]] && { unset ROOTFS; unset CMD_CHROOT; } || { ROOTFS="/sysroot"; CMD_CHROOT="chroot ${ROOTFS}"; }
. usr/lib/ublinux/os-config 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" "$@" debug_mode "$0" "$@"
echo $SYSCONF | grep -q ^/ && SYSCONF=.$SYSCONF SYSCONF="${ROOTFS}/${SYSCONF}"
SOURCE=${SYSCONF}/config; [ -f "${SOURCE}" ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
SOURCE=${SYSCONF}/system; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
[ -z "$(cmdline_value servicesstart)" ] || SERVICESSTART=$(cmdline_value servicesstart) exec_copy_to_initd(){
[ -z "$(cmdline_value servicesnostart)" ] || SERVICESNOSTART=$(cmdline_value servicesnostart) # Функция создания симлинка в /etc/init.d на сервисы из /etc/rc.d/init.d
PATH_INITD="${ROOTFS}/etc/init.d"
PATH_RCD_INITD="${ROOTFS}/etc/rc.d/init.d"
while read -u3 SELECT_FILE_SERVICE; do
[[ -e ${PATH_INITD}/${SELECT_FILE_SERVICE} ]] || ln -s ${PATH_RCD_INITD}/${SELECT_FILE_SERVICE} ${PATH_INITD}
done 3< <(ls -1 ${PATH_RCD_INITD} 2>/dev/null | grep -vE "README|functions")
}
if [ ! -z "$SERVICESSTART$SERVICESNOSTART$SERVICESMASK$SERVICESUNMASK" ] ;then exec_services_enabledisable(){
# Функция включения/отключения сервисов в предзагрузке
# $1 Команды set или remove с режимом, варианты: set=|set+=|set++=|set-=|set--=|remove
# $2 Параметр со значением, пример: SERVICES_ENABLE=pcscd.service,nmb,smb
# null Если отсутствует $@, то применяем из системной конфигурации SERVICESSTART SERVICESNOSTART SERVICESMASK SERVICESUNMASK
ISSYSTEMD=$(readlink -fq ${ROOTFS}/usr/bin/init | grep "lib/systemd/systemd$")
[[ $1 == @("set="|"set+="|"set++="|"set-="|"set--="|"remove") ]] && shift
local PARAM="$@"
if [[ -n ${PARAM} ]]; then
unset SERVICESSTART SERVICESNOSTART SERVICESMASK SERVICESUNMASK
unset SERVICES_ENABLE SERVICES_DISABLE SERVICES_MASK SERVICES_UNMASK
eval "${PARAM%%=*}='${PARAM#*=}'"
else
SERVICESSTART_KERNEL=$(cmdline_value servicesstart)
SERVICES_ENABLE_KERNEL=$(cmdline_value services_enable)
[[ -z ${SERVICESSTART_KERNEL} ]] || SERVICESSTART=${SERVICESSTART_KERNEL}
[[ -z ${SERVICES_ENABLE_KERNEL} ]] || SERVICES_ENABLE=${SERVICES_ENABLE_KERNEL}
SERVICESNOSTART_KERNEL=$(cmdline_value servicesnostart)
SERVICES_DISABLE_KERNEL=$(cmdline_value services_disable)
[[ -z ${SERVICESNOSTART_KERNEL} ]] || SERVICESNOSTART=${SERVICESNOSTART_KERNEL}
[[ -z ${SERVICES_DISABLE_KERNEL} ]] || SERVICES_DISABLE=${SERVICES_DISABLE_KERNEL}
fi
if [[ -n "${SERVICESSTART}${SERVICESNOSTART}${SERVICESMASK}${SERVICESUNMASK}${SERVICES_ENABLE}${SERVICES_DISABLE}${SERVICES_MASK}${SERVICES_UNMASK}" ]]; then
if [[ -n ${ROOTFS} ]]; then
mkdir -p proc mkdir -p proc
mount -o rbind /proc proc mount -o rbind /proc proc
ISSYSTEMD=$(readlink -fq usr/bin/init | grep "lib/systemd/systemd$")
for a in $(echo $SERVICESUNMASK,$SERVICESSTART | tr , " ") ;do
[ $ISSYSTEMD ] && chroot . systemctl unmask $a
done
for a in $(echo $SERVICESSTART | tr , " ") ;do
if [ $ISSYSTEMD ] ;then
chroot . systemctl enable $a || true
else
true
fi fi
done while IFS= read -ru3 SELECT_SERVICE; do
for a in $(echo $SERVICESNOSTART | tr , " ") ;do [[ -n ${SELECT_SERVICE} ]] || continue
if [ $ISSYSTEMD ] ;then if [[ -n ${ISSYSTEMD} ]]; then
chroot . systemctl disable $a || true ${CMD_CHROOT} systemctl --quiet unmask ${SELECT_SERVICE}
else
true
fi fi
done 3< <(tr ',; ' '\n' <<< "${SERVICESUNMASK},${SERVICESSTART},${SERVICES_UNMASK},${SERVICES_ENABLE}" | tr -s '\n')
while IFS= read -ru3 SELECT_SERVICE; do
[[ -n ${SELECT_SERVICE} ]] || continue
if [[ -n ${ISSYSTEMD} ]]; then
${CMD_CHROOT} systemctl --quiet enable ${SELECT_SERVICE}
fi
done 3< <(tr ',; ' '\n' <<< "${SERVICESSTART},${SERVICES_ENABLE}" | tr -s '\n')
while IFS= read -ru3 SELECT_SERVICE; do
[[ -n ${SELECT_SERVICE} ]] || continue
if [[ -n ${ISSYSTEMD} ]]; then
${CMD_CHROOT} systemctl --quiet disable ${SELECT_SERVICE}
fi
done 3< <(tr ',; ' '\n' <<< "${SERVICESNOSTART},${SERVICES_DISABLE}" | tr -s '\n')
while IFS= read -ru3 SELECT_SERVICE; do
[[ -n ${SELECT_SERVICE} ]] || continue
if [[ -n ${ISSYSTEMD} ]]; then
${CMD_CHROOT} systemctl --quiet disable ${SELECT_SERVICE}
${CMD_CHROOT} systemctl --quiet mask ${SELECT_SERVICE}
fi
done 3< <(tr ',; ' '\n' <<< "${SERVICESMASK},${SERVICES_MASK}" | tr -s '\n')
[[ -n ${ROOTFS} ]] && umount proc
fi
}
exec_services_startstop_live(){
# Функция запуска/остановка сервисов в загруженной системе
# $1 Команды set или remove с режимом, варианты: set=|set+=|set++=|set-=|set--=|remove
# $2 Параметр со значением. Пример: SERVICESSTART=pcscd.service,nmb,smb
# null Если отсутствует $@, то применяем из системной конфигурации SERVICESSTART SERVICESNOSTART SERVICESMASK SERVICESUNMASK SERVICES_ENABLE SERVICES_DISABLE SERVICES_MASK SERVICES_UNMASK
# Если выполнение в initrd, то выход
[[ -z ${ROOTFS} ]] || return 0
ISSYSTEMD=$(readlink -fq ${ROOTFS}/usr/bin/init | grep "lib/systemd/systemd$")
[[ $1 == @("set="|"set+="|"set++="|"set-="|"set--="|"remove") ]] && COMMAND=$1 && shift
[[ -n ${COMMAND} ]] || COMMAND="set="
local PARAM="$@"
if [[ -n ${PARAM} ]]; then
unset SERVICESSTART SERVICESNOSTART SERVICESMASK SERVICESUNMASK
unset SERVICES_ENABLE SERVICES_DISABLE SERVICES_MASK SERVICES_UNMASK
[[ ${PARAM%%=*} =~ [!\$%\&()*+,./:\;\<\=\>?\@\^\{|\}~-] ]] || eval "${PARAM%%=*}='${PARAM#*=}'"
fi
while IFS= read -ru3 SELECT_SERVICE; do
[[ -n ${SELECT_SERVICE} ]] || continue
if [[ ${COMMAND} == @("set="|"set+="|"set++=") ]]; then
if [[ -n ${ISSYSTEMD} ]]; then
systemctl --quiet start ${SELECT_SERVICE}
fi
elif [[ ${COMMAND} == @("set-="|"set--=") ]]; then
if [[ -n ${ISSYSTEMD} ]]; then
systemctl --quiet stop ${SELECT_SERVICE}
fi
fi
done 3< <(tr ',; ' '\n' <<< "${SERVICESSTART},${SERVICES_ENABLE}" | tr -s '\n')
while IFS= read -ru3 SELECT_SERVICE; do
[[ -n ${SELECT_SERVICE} ]] || continue
if [[ ${COMMAND} == @("set="|"set+="|"set++=") ]]; then
if [[ -n ${ISSYSTEMD} ]]; then
systemctl --quiet stop ${SELECT_SERVICE}
fi
fi
done 3< <(tr ',; ' '\n' <<< "${SERVICESNOSTART},${SERVICESMASK},${SERVICES_DISABLE},${SERVICES_MASK}" | tr -s '\n')
}
#Выключил, т.к. проблематично проигнорировать все SERVICE[*] из os-config, если заданы SERVICE[*] в глобальном конфиге
#exec_services_enabledisable_new(){
## Функция включения/отключения сервисов в предзагрузке
## $1 Команды set или remove с режимом, варианты: set=|set+=|set++=|set-=|set--=|remove
## $2 Параметр со значением, пример: SERVICE[smb]=enable
## null Если отсутствует $@, то применяем из системной конфигурации SERVICE[<name>]=start|enable|on|stop|disable|off|mask|unmask
# ISSYSTEMD=$(readlink -fq ${ROOTFS}/usr/bin/init | grep "lib/systemd/systemd$")
# [[ $1 == @("set="|"set+="|"set++="|"set-="|"set--="|"remove") ]] && shift
# local PARAM="$@"
# if [[ -n ${PARAM} ]]; then
# unset SERVICE
# declare -A SERVICE
# eval "${PARAM%%=*}='${PARAM#*=}'"
# else
# SERVICES_ENABLE_KERNEL=$(cmdline_value services_enable)
# [[ -z ${SERVICES_ENABLE_KERNEL} ]] || while read -u3 SELECT_SERVICE; do
# [[ -n ${SELECT_SERVICE} ]] || continue
# SERVICE[${SELECT_SERVICE}]=enable
# done 3< <(tr ',; ' '\n' <<< "${SERVICES_ENABLE_KERNEL}" | tr -s '\n')
#
# SERVICES_DISABLE_KERNEL=$(cmdline_value services_disable)
# [[ -z ${SERVICES_DISABLE_KERNEL} ]] || while read -u3 SELECT_SERVICE; do
# [[ -n ${SELECT_SERVICE} ]] || continue
# SERVICE[${SELECT_SERVICE}]=disable
# done 3< <(tr ',; ' '\n' <<< "${SERVICES_DISABLE_KERNEL}" | tr -s '\n')
# fi
# if [[ -n "${SERVICE[@]}" ]]; then
# if [[ -n ${ROOTFS} ]]; then
# mkdir -p proc
# mount -o rbind /proc proc
# fi
# while read -u3 SELECT_SERVICE; do
# [[ -n ${SELECT_SERVICE} ]] || continue
# if [[ ${SERVICE[${SELECT_SERVICE}]} == @(start|enable|on) ]]; then
# if [[ -n ${ISSYSTEMD} ]]; then
# echo ${CMD_CHROOT} systemctl --quiet unmask ${SELECT_SERVICE}
# echo ${CMD_CHROOT} systemctl --quiet enable ${SELECT_SERVICE}
# fi
# elif [[ ${SERVICE[${SELECT_SERVICE}]} == @(stop|disable|off) ]]; then
# if [[ -n ${ISSYSTEMD} ]]; then
# echo ${CMD_CHROOT} systemctl --quiet disable ${SELECT_SERVICE}
# fi
# elif [[ ${SERVICE[${SELECT_SERVICE}]} == @(mask) ]]; then
# if [[ -n ${ISSYSTEMD} ]]; then
# echo ${CMD_CHROOT} systemctl --quiet disable ${SELECT_SERVICE}
# echo ${CMD_CHROOT} systemctl --quiet mask ${SELECT_SERVICE}
# fi
# elif [[ ${SERVICE[${SELECT_SERVICE}]} == @(unmask) ]]; then
# if [[ -n ${ISSYSTEMD} ]]; then
# echo ${CMD_CHROOT} systemctl --quiet unmask ${SELECT_SERVICE}
# fi
# fi
# done 3< <(printf "%s\n" "${!SERVICE[@]}")
# [[ -n ${ROOTFS} ]] && umount proc
# fi
#}
#Выключил, т.к. проблематично проигнорировать все SERVICE[*] из os-config, если заданы SERVICE[*] в глобальном конфиге
#exec_services_startstop_live_new(){
## Функция запуска/остановка сервисов в загруженной системе
## $1 Команды set или remove с режимом, варианты: set=|set+=|set++=|set-=|set--=|remove
## $2 Параметр со значением, пример: SERVICE[smb]=enable
## null Если отсутствует $@, то применяем из системной конфигурации SERVICE[*]=start|enable|on|stop|disable|off|mask|unmask
## Если выполнение в initrd, то выход
# [[ -z ${ROOTFS} ]] || return 0
# ISSYSTEMD=$(readlink -fq ${ROOTFS}/usr/bin/init | grep "lib/systemd/systemd$")
# [[ $1 == @("set="|"set+="|"set++="|"set-="|"set--="|"remove") ]] && shift
# local PARAM="$@"
# if [[ -n ${PARAM} ]]; then
# unset SERVICE
# declare -A SERVICE
# [[ ${PARAM%%=*} =~ [!\$%\&()*+,/\;\<\=\>?\^\{|\}~-] ]] || eval "${PARAM%%=*}='${PARAM#*=}'"
# fi
# while read -u3 SELECT_SERVICE; do
# if [[ ${SERVICE[${SELECT_SERVICE}]} == @(start|enable|on) ]]; then
# if [[ -n ${ISSYSTEMD} ]]; then
# echo ${CMD_CHROOT} systemctl --quiet start ${SELECT_SERVICE}
# fi
# elif [[ ${SERVICE[${SELECT_SERVICE}]} == @(stop|disable|off) ]]; then
# if [[ -n ${ISSYSTEMD} ]]; then
# echo ${CMD_CHROOT} systemctl --quiet stop ${SELECT_SERVICE}
# fi
# fi
# done 3< <(printf "%s\n" "${!SERVICE[@]}")
#}
################
##### MAIN #####
################
# Если файл подключен как ресурс с функциями, то выйти
return 0 2>/dev/null && return 0
if [[ -z $@ ]]; then
while read -r FUNCTION; do
$"${FUNCTION##* }"
done < <(declare -F | grep "declare -f exec_")
else
while [[ $# -gt 0 ]]; do
declare -f ${1} &>/dev/null && FUNCTION+="; ${1}" && shift || { FUNCTION+=" \"${1}\"" && shift; }
done done
for a in $(echo $SERVICESMASK | tr , " ") ;do eval ${FUNCTION#*; }
[ $ISSYSTEMD ] && chroot . systemctl disable $a fi
[ $ISSYSTEMD ] && chroot . systemctl mask $a
done
umount proc
fi

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# Initial script for Live operating system # Initial script for UBLinux
# This script are launching before starting init from linux-live script. # This script are launching before starting init from initrd script
# Current dir allways must be set to root (/) # Current dir allways must be set to root (/)
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
@ -13,7 +13,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
[[ -d /usr/lib/ublinux ]] && { unset ROOTFS; unset CMD_CHROOT; } || { ROOTFS='.'; CMD_CHROOT='chroot . '; } [[ -d /usr/lib/ublinux ]] && { unset ROOTFS; unset CMD_CHROOT; } || { ROOTFS='.'; CMD_CHROOT='chroot . '; }
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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -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" "$@" debug_mode "$0" "$@"
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"

@ -1,19 +1,19 @@
#!/usr/bin/bash #!/usr/bin/bash
# #
# Initial script for Live operating system # Initial script for UBLinux
# This script are launching before starting init from linux-live script. # This script are launching before starting init from initrd script
# Current dir allways must be set to root (/) # Current dir allways must be set to root (/)
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=. unset ROOTFS; [[ -d /usr/lib/ublinux ]] || 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 || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -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" "$@" debug_mode "$0" "$@"
SYSCONF="${ROOTFS}/${SYSCONF}" SYSCONF="${ROOTFS}/${SYSCONF}"

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save