From f72b7599c0bafe19ec46e676333f91df4ea9a427 Mon Sep 17 00:00:00 2001 From: asmeron Date: Mon, 15 Jan 2024 13:09:23 +0600 Subject: [PATCH] Many fix and new functions --- ublinux/{os-config => default} | 11 +- ublinux/functions | 5 +- ublinux/rc.d/rc.desktop | 4 +- ublinux/rc.d/rc.local | 2 +- ublinux/rc.d/rc.network | 2 +- ublinux/rc.desktop/all/autoexec | 6 +- ublinux/rc.desktop/all/bookmarks | 4 +- ublinux/rc.desktop/all/fusion-icon | 4 +- ublinux/rc.desktop/all/keyboard | 2 +- ublinux/rc.desktop/all/ldconfig | 4 +- ublinux/rc.desktop/all/placeondesktop | 4 +- ublinux/rc.desktop/all/pulseaudio | 11 +- ublinux/rc.desktop/all/qtox | 4 +- ublinux/rc.desktop/all/rfkill | 2 +- ublinux/rc.desktop/all/ublinuxupdate | 12 +- ublinux/rc.desktop/all/xbindkeys | 4 +- ublinux/rc.desktop/all/xss_heartbeat | 4 +- ublinux/rc.desktop/deonly/cryptkeeper | 4 +- ublinux/rc.desktop/deonly/exclusiveapp | 4 +- .../deonly/gnome-network-proxy-system | 2 +- ublinux/rc.desktop/deonly/guake | 4 +- ublinux/rc.desktop/deonly/hideloop4dolphin | 4 +- .../rc.desktop/deonly/i3-notification-daemon | 4 +- .../deonly/mate-authentication-agent | 4 +- ublinux/rc.desktop/deonly/parcellite | 4 +- ublinux/rc.desktop/deonly/qterminal | 4 +- ublinux/rc.desktop/deonly/trolltech | 2 +- .../rc.desktop/deonly/xfce4-screensaver-fix | 2 +- ublinux/rc.desktop/deonly/xfce4-xfconf | 4 +- ublinux/rc.desktop/deonly/yakuake | 4 +- ublinux/rc.domain.d/30-usershwaccess | 4 +- ublinux/rc.halt.pre/01-sysrq-sleepshutdown | 2 +- ublinux/rc.halt.pre/10-shutdown | 5 +- ublinux/rc.halt.pre/15-cleanup | 2 +- ublinux/rc.halt.pre/20-grub | 4 +- ublinux/rc.halt.pre/70-savetomodule | 5 +- ublinux/rc.halt.pre/75-save-cache | 4 +- ublinux/rc.halt.pre/76-save-rootcopy | 4 +- ublinux/rc.halt.pre/80-upgrade | 4 +- ublinux/rc.halt.pre/85-chmod | 2 +- ublinux/rc.halt.pre/90-deactivate | 2 +- ublinux/rc.halt.pre/95-umount | 2 +- ublinux/rc.halt/20-timesave | 2 +- ublinux/rc.local.d/01-background | 4 +- ublinux/rc.local.d/10-sudoers | 4 +- ublinux/rc.local.d/31-sound | 5 +- ublinux/rc.local.d/41-x11vnc | 2 +- ublinux/rc.local.d/42-domain_join | 4 +- ublinux/rc.local.d/50-update-cache-gdk-pixbuf | 2 +- ublinux/rc.local.d/50-update-cache-gtk-icon | 4 +- ublinux/rc.local.d/50-update-desktop-database | 4 +- .../rc.local.d/50-update-glib-compile-schemas | 4 +- ublinux/rc.local.d/50-update-mime | 4 +- ublinux/rc.local.d/51-mozilla_extensions | 4 +- ublinux/rc.local.d/52-consolesetup | 2 +- ublinux/rc.local.d/54-plymouth | 4 +- ublinux/rc.local.d/55-x2go | 4 +- ublinux/rc.local.d/91-cts | 2 +- ublinux/rc.local.d/91-eula | 9 +- ublinux/rc.local.d/99-1c-enterprise | 2 +- ublinux/rc.network.d/10-network | 2 +- ublinux/rc.network.d/81-samba | 4 +- ublinux/rc.network.d/90-ublinuxupdate | 6 +- ublinux/rc.post.d/01-system | 4 +- ublinux/rc.post.d/02-hwclock | 2 +- ublinux/rc.post.d/03-modprobepreload | 4 +- ublinux/rc.post.d/09-automount | 2 +- ublinux/rc.post.d/10-brand-backgrounds | 6 +- ublinux/rc.post.d/11-xorg | 2 +- ublinux/rc.post.d/12-dm-background | 2 +- ublinux/rc.post.d/16-kiosk-desktop | 2 +- ublinux/rc.post.d/17-kiosk-gtk | 2 +- ublinux/rc.post.d/18-kiosk-xfce4-kioskrc | 2 +- ublinux/rc.post.d/20-initrd | 2 +- ublinux/rc.post.d/23-publicdir | 5 +- ublinux/rc.post.d/30-network | 4 +- ublinux/rc.post.d/35-soundprofile | 5 +- ublinux/rc.post.d/42-access-suid-sgid | 4 +- ublinux/rc.post.d/43-access-exec | 4 +- ublinux/rc.post.d/44-mountattr | 4 +- ublinux/rc.post.d/45-disk-quota | 20 +- ublinux/rc.post.d/46-cgroup-quota | 8 +- ublinux/rc.post.d/50-update-fonts | 4 +- ublinux/rc.post.d/51-theme | 4 +- ublinux/rc.post.d/60-blacklistdkms | 4 +- ublinux/rc.post.d/90-kesl | 2 +- ublinux/rc.post/01-system | 2 +- ublinux/rc.post/10-ldconfig | 4 +- ublinux/rc.post/20-plymouth | 2 +- ublinux/rc.post/30-selinux | 2 +- ublinux/rc.preinit.d/01-depmod | 14 +- ublinux/rc.preinit.d/02-modulespreload | 6 +- ublinux/rc.preinit.d/03-ldconfig | 13 +- ublinux/rc.preinit.d/10-system | 7 +- ublinux/rc.preinit.d/11-partitions | 9 +- ublinux/rc.preinit.d/12-save2module | 4 +- ublinux/rc.preinit.d/13-release | 4 +- ublinux/rc.preinit.d/20-services | 256 +++++++++++++++--- ublinux/rc.preinit.d/21-ntp | 6 +- ublinux/rc.preinit.d/22-samba | 8 +- ublinux/rc.preinit.d/23-realmd | 6 +- ublinux/rc.preinit.d/30-network-hostname | 7 +- ublinux/rc.preinit.d/31-network-proxy-system | 6 +- ublinux/rc.preinit.d/32-network | 6 +- ublinux/rc.preinit.d/35-iptables | 8 +- ublinux/rc.preinit.d/36-ufw | 8 +- ublinux/rc.preinit.d/40-authpam | 9 +- ublinux/rc.preinit.d/50-xorg | 6 +- ublinux/rc.preinit.d/50-xorg-old | 8 +- 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 | 6 +- ublinux/rc.preinit.d/58-access-login | 6 +- ublinux/rc.preinit.d/59-polkit | 6 +- ublinux/rc.preinit.d/63-xorg-dpi | 6 +- ublinux/rc.preinit.d/70-virtualbox | 6 +- ublinux/rc.preinit.d/71-vmware | 6 +- ublinux/rc.preinit.d/72-hyperv | 6 +- ublinux/rc.preinit.d/73-qemu | 6 +- .../rc.preinit.d/80-server-containers-storage | 6 +- .../rc.preinit.d/81-server-libvirt-storage | 6 +- ublinux/rc.preinit.d/90-apparmor | 7 +- ublinux/rc.preinit.d/99-osinstall | 6 +- ublinux/rc.preinit/01-inifile | 27 +- ublinux/rc.preinit/02-skel-adds | 6 +- ublinux/rc.preinit/03-initvars | 10 +- ublinux/rc.preinit/10-accounts | 47 +++- ublinux/rc.xorg/00-envvars | 2 +- ublinux/rc.xorg/01-de-background | 4 +- ublinux/rc.xorg/02-xrandr | 4 +- ublinux/rc.xorg/10-fixkeyboard_layout | 2 +- ublinux/rc.xorg/20-video-xorg-dpi | 2 +- ublinux/rc.xorg/50-domain_join | 4 +- ublinux/rc.xorg/60-checknet | 4 +- ublinux/rc.xorg/90-secretnet | 2 +- ublinux/scripts/grub-functions | 2 +- ublinux/templates/ublinux-data.ini | 254 +++++++++-------- 141 files changed, 741 insertions(+), 486 deletions(-) rename ublinux/{os-config => default} (95%) diff --git a/ublinux/os-config b/ublinux/default similarity index 95% rename from ublinux/os-config rename to ublinux/default index 3d80140..7ec901b 100644 --- a/ublinux/os-config +++ b/ublinux/default @@ -127,7 +127,6 @@ KEYBOARD=ru KEYTABLE=ru4 #STEAMNODPMS=yes - #/rc.preinit/10-accounts DEFAULTPASSWD='$6$E7stRhRS8fCKk7UU$Qoqw62AUaUa5uLIc2KC7WV3MUThhrR8kjXtCODmnKCzKe2zHu1/wmsiWBHZEIk/IQnk/aELQYbUK93OUtrwg60' DEFAULTROOTPASSWD='$6$E7stRhRS8fCKk7UU$Qoqw62AUaUa5uLIc2KC7WV3MUThhrR8kjXtCODmnKCzKe2zHu1/wmsiWBHZEIk/IQnk/aELQYbUK93OUtrwg60' @@ -140,7 +139,7 @@ ADMUID=1000 ADDADM=yes #/rc.preinit/10-accounts -HASHPASSWD=sha512crypt +HASHPASSWD=yescrypt #/rc.preinit/50-xorg #NVIDIATEST="nvidia-current nvidia340 nvidia304 nvidia" @@ -160,7 +159,7 @@ CONSOLE_KEYMAP=ru CONSOLE_KEYMAP_TOGGLE="grp:lctrl_lshift_toggle" #/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 # Папка с правами 777 доступная всем локальным пользователям и при разрешении всем из сети @@ -190,6 +189,12 @@ HWCLOCK_SYNC=utc #/rc.preinit.d/10-system ZONE=Etc/UTC +#/rc.preinit.d/01-depmod +DEPMOD=yes + +#/rc.preinit.d/03-ldconfig +RUNLDCONFIG=yes + #/rc.preinit.d/52-desktop #/rc.post.d/02-hwclock #/rc.post.d/11-xorg diff --git a/ublinux/functions b/ublinux/functions index af7509b..fa68f4e 100755 --- a/ublinux/functions +++ b/ublinux/functions @@ -163,8 +163,9 @@ echodebug(){ # $2 = output filesystem module file # $3..$9 = optional arguments like -keep-as-directory or -b 123456789 create_module(){ - . /usr/lib/ublinux/os-config + . /usr/lib/ublinux/default . /etc/ublinux/config 2>/dev/null + . /etc/ublinux/system 2>/dev/null echo " $@ " | egrep -q ' -comp | -noD ' && MKSQFS_OPTS= mksquashfs "$1" "$2" $MKSQFS_OPTS $3 $4 $5 $6 $7 $8 $9 -noappend >/dev/null || return 1 chmod 444 "$2" @@ -263,7 +264,7 @@ xss_slideshow(){ } xss_heartbeat(){ - . /usr/lib/ublinux/os-config + . /usr/lib/ublinux/default . /etc/ublinux/config 2>/dev/null 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 " & diff --git a/ublinux/rc.d/rc.desktop b/ublinux/rc.d/rc.desktop index b2b872c..8ed2e35 100755 --- a/ublinux/rc.d/rc.desktop +++ b/ublinux/rc.d/rc.desktop @@ -1,12 +1,12 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 NOEXEC="i3term:xbindkeys;i3term:fusion-icon;i3term:ublinuxupdate" . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.d/rc.local b/ublinux/rc.d/rc.local index 4e4460c..cf2548c 100755 --- a/ublinux/rc.d/rc.local +++ b/ublinux/rc.d/rc.local @@ -2,7 +2,7 @@ DEBUGMODE=no . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default debug_mode "$0" "$@" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.d/rc.network b/ublinux/rc.d/rc.network index 696c6e9..f0d00e1 100755 --- a/ublinux/rc.d/rc.network +++ b/ublinux/rc.d/rc.network @@ -2,7 +2,7 @@ DEBUGMODE=no . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default debug_mode "$0" "$@" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.desktop/all/autoexec b/ublinux/rc.desktop/all/autoexec index 09e2885..5750be4 100755 --- a/ublinux/rc.desktop/all/autoexec +++ b/ublinux/rc.desktop/all/autoexec @@ -4,7 +4,7 @@ ENABLED=yes [[ ${ENABLED} != yes ]] && exit 0 . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default SOURCE=${SYSCONF}/config; [[ -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 shift exec_autoexec_set $@ - KERNEL_AUTOEXEC=$(cmdline_value autoexec) - [[ ${KERNEL_AUTOEXEC} == "" ]] || exec_autoexec_set set AUTOEXEC=${KERNEL_AUTOEXEC} + KERNEL_AUTOEXEC="$(cmdline_value autoexec)" + [[ -n ${KERNEL_AUTOEXEC} ]] && exec_autoexec_set AUTOEXEC="${KERNEL_AUTOEXEC}" elif [[ $1 == remove ]]; then shift exec_autoexec_remove $@ diff --git a/ublinux/rc.desktop/all/bookmarks b/ublinux/rc.desktop/all/bookmarks index d100dab..4fb2e26 100755 --- a/ublinux/rc.desktop/all/bookmarks +++ b/ublinux/rc.desktop/all/bookmarks @@ -1,9 +1,9 @@ #!/bin/sh 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} diff --git a/ublinux/rc.desktop/all/fusion-icon b/ublinux/rc.desktop/all/fusion-icon index e551cd0..1ce99a5 100755 --- a/ublinux/rc.desktop/all/fusion-icon +++ b/ublinux/rc.desktop/all/fusion-icon @@ -1,13 +1,13 @@ #!/bin/sh ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 FUSIONICONTIMEOUT=5 FUSIONICONDEDIS=gnome-shell,gnome,i3term [ -f /etc/ublinux/compositing-wm ] && . /etc/ublinux/compositing-wm . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.desktop/all/keyboard b/ublinux/rc.desktop/all/keyboard index fc8f987..6da4383 100755 --- a/ublinux/rc.desktop/all/keyboard +++ b/ublinux/rc.desktop/all/keyboard @@ -5,7 +5,7 @@ ENABLED=yes 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/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}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.desktop/all/ldconfig b/ublinux/rc.desktop/all/ldconfig index d23cce9..321134a 100755 --- a/ublinux/rc.desktop/all/ldconfig +++ b/ublinux/rc.desktop/all/ldconfig @@ -1,8 +1,8 @@ #!/bin/bash ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 -. /usr/lib/ublinux/os-config +[[ ${ENABLED} == "yes" ]] || exit 0 +. /usr/lib/ublinux/default SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null [ "$RUNLDCONFIG" != "yes" -a "$RUNLDCONFIG" != "no" ] && bash -c "sleep 30 && sudo /sbin/ldconfig" & diff --git a/ublinux/rc.desktop/all/placeondesktop b/ublinux/rc.desktop/all/placeondesktop index 772d55a..a4e42db 100755 --- a/ublinux/rc.desktop/all/placeondesktop +++ b/ublinux/rc.desktop/all/placeondesktop @@ -1,11 +1,11 @@ #!/bin/sh ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 XDG_DESKTOP_DIR="$HOME/Рабочий стол" -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null [ -z "$PLACEONDESKTOP" ] && exit 0 diff --git a/ublinux/rc.desktop/all/pulseaudio b/ublinux/rc.desktop/all/pulseaudio index 40fac05..645a397 100755 --- a/ublinux/rc.desktop/all/pulseaudio +++ b/ublinux/rc.desktop/all/pulseaudio @@ -1,9 +1,16 @@ #!/bin/sh 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 [ "$SOUNDPROFILE" = "pulse" -a "$PULSEAUDIOSTART" != "no" ] && start-pulseaudio-x11 & diff --git a/ublinux/rc.desktop/all/qtox b/ublinux/rc.desktop/all/qtox index ad77bd3..f7dc1fe 100755 --- a/ublinux/rc.desktop/all/qtox +++ b/ublinux/rc.desktop/all/qtox @@ -3,10 +3,10 @@ [ -f ~/.config/tox/qtox.ini ] && exit 0 ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.desktop/all/rfkill b/ublinux/rc.desktop/all/rfkill index aabe1b9..6766d6c 100755 --- a/ublinux/rc.desktop/all/rfkill +++ b/ublinux/rc.desktop/all/rfkill @@ -1,7 +1,7 @@ #!/bin/sh ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 . /usr/lib/ublinux/functions diff --git a/ublinux/rc.desktop/all/ublinuxupdate b/ublinux/rc.desktop/all/ublinuxupdate index 8c9995e..0fd956f 100755 --- a/ublinux/rc.desktop/all/ublinuxupdate +++ b/ublinux/rc.desktop/all/ublinuxupdate @@ -1,7 +1,15 @@ #!/bin/bash # Description: This script ask user for update system 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() @@ -86,7 +94,7 @@ export TEXTDOMAIN=ublinux_functions echo $PATH | grep -q /usr/lib/ublinux/scripts || PATH=/usr/lib/ublinux/scripts:$PATH . /etc/os-release . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null DEBUGMODE=no debug_mode "$0" "$@" diff --git a/ublinux/rc.desktop/all/xbindkeys b/ublinux/rc.desktop/all/xbindkeys index 4359089..1a1f65d 100755 --- a/ublinux/rc.desktop/all/xbindkeys +++ b/ublinux/rc.desktop/all/xbindkeys @@ -1,8 +1,8 @@ #!/bin/sh ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default [ "$XBINDKEYSSTART" = "yes" ] && xbindkeys $XBINDKEYSOPTIONS & diff --git a/ublinux/rc.desktop/all/xss_heartbeat b/ublinux/rc.desktop/all/xss_heartbeat index 19349b9..65a564d 100755 --- a/ublinux/rc.desktop/all/xss_heartbeat +++ b/ublinux/rc.desktop/all/xss_heartbeat @@ -1,7 +1,7 @@ #!/bin/sh # xscreensaver helper scripts ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 XSSHBTM=20s # exit for DE @@ -14,7 +14,7 @@ XSSBLRUNED="kscreenlocker" XSSBLLOADED="media-play,mplayer,tvtime,firefox,steam,chromium" /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.desktop/deonly/cryptkeeper b/ublinux/rc.desktop/deonly/cryptkeeper index 90fe309..9df898f 100755 --- a/ublinux/rc.desktop/deonly/cryptkeeper +++ b/ublinux/rc.desktop/deonly/cryptkeeper @@ -4,9 +4,9 @@ # 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 diff --git a/ublinux/rc.desktop/deonly/exclusiveapp b/ublinux/rc.desktop/deonly/exclusiveapp index 4b14dda..725d861 100755 --- a/ublinux/rc.desktop/deonly/exclusiveapp +++ b/ublinux/rc.desktop/deonly/exclusiveapp @@ -1,13 +1,13 @@ #!/bin/sh ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 EXCLUSIVEAPP=remmina TERMMODEEXIT="i3-msg exit" TERMMODSCRIPTPRE= TERMMODETIMEOUT=15 -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.desktop/deonly/gnome-network-proxy-system b/ublinux/rc.desktop/deonly/gnome-network-proxy-system index b18d923..d4a5b8d 100755 --- a/ublinux/rc.desktop/deonly/gnome-network-proxy-system +++ b/ublinux/rc.desktop/deonly/gnome-network-proxy-system @@ -5,7 +5,7 @@ ENABLED=yes 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/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}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.desktop/deonly/guake b/ublinux/rc.desktop/deonly/guake index 4a46385..c84403d 100755 --- a/ublinux/rc.desktop/deonly/guake +++ b/ublinux/rc.desktop/deonly/guake @@ -1,9 +1,9 @@ #!/bin/sh 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 diff --git a/ublinux/rc.desktop/deonly/hideloop4dolphin b/ublinux/rc.desktop/deonly/hideloop4dolphin index 848b60b..8c3f20e 100755 --- a/ublinux/rc.desktop/deonly/hideloop4dolphin +++ b/ublinux/rc.desktop/deonly/hideloop4dolphin @@ -1,13 +1,13 @@ #!/bin/sh ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DOLPHINBOOKMARKS=.local/share/user-places.xbel HIDELOOP=255 HIDERAM=0 HIDEZRAM=8 -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default [ "$HIDELOOP4DOLPHIN" = "no" ] && exit 0 if [ "$1" != "fork" ] ;then diff --git a/ublinux/rc.desktop/deonly/i3-notification-daemon b/ublinux/rc.desktop/deonly/i3-notification-daemon index 828fdb3..d08a52e 100755 --- a/ublinux/rc.desktop/deonly/i3-notification-daemon +++ b/ublinux/rc.desktop/deonly/i3-notification-daemon @@ -1,11 +1,11 @@ #!/bin/sh ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 I3_NOTIFYD=yes -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.desktop/deonly/mate-authentication-agent b/ublinux/rc.desktop/deonly/mate-authentication-agent index 6f2c9ae..4ea0be1 100755 --- a/ublinux/rc.desktop/deonly/mate-authentication-agent +++ b/ublinux/rc.desktop/deonly/mate-authentication-agent @@ -1,7 +1,7 @@ #!/bin/sh ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 -. /usr/lib/ublinux/os-config +[[ ${ENABLED} == "yes" ]] || exit 0 +. /usr/lib/ublinux/default [ "$MATEPAAGENTSTART" != "no" ] && /usr/lib64/polkit-mate-authentication-agent-1 & diff --git a/ublinux/rc.desktop/deonly/parcellite b/ublinux/rc.desktop/deonly/parcellite index 52b9873..51b811c 100755 --- a/ublinux/rc.desktop/deonly/parcellite +++ b/ublinux/rc.desktop/deonly/parcellite @@ -1,9 +1,9 @@ #!/bin/sh 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 diff --git a/ublinux/rc.desktop/deonly/qterminal b/ublinux/rc.desktop/deonly/qterminal index cc6d280..12dd668 100755 --- a/ublinux/rc.desktop/deonly/qterminal +++ b/ublinux/rc.desktop/deonly/qterminal @@ -1,9 +1,9 @@ #!/bin/sh 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 diff --git a/ublinux/rc.desktop/deonly/trolltech b/ublinux/rc.desktop/deonly/trolltech index 4c1bd5b..33a4f08 100755 --- a/ublinux/rc.desktop/deonly/trolltech +++ b/ublinux/rc.desktop/deonly/trolltech @@ -1,7 +1,7 @@ #!/bin/sh ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 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 diff --git a/ublinux/rc.desktop/deonly/xfce4-screensaver-fix b/ublinux/rc.desktop/deonly/xfce4-screensaver-fix index c621d82..95eb34c 100755 --- a/ublinux/rc.desktop/deonly/xfce4-screensaver-fix +++ b/ublinux/rc.desktop/deonly/xfce4-screensaver-fix @@ -1,7 +1,7 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 #. /etc/ublinux/config diff --git a/ublinux/rc.desktop/deonly/xfce4-xfconf b/ublinux/rc.desktop/deonly/xfce4-xfconf index 11e6a99..a57442f 100755 --- a/ublinux/rc.desktop/deonly/xfce4-xfconf +++ b/ublinux/rc.desktop/deonly/xfce4-xfconf @@ -1,9 +1,9 @@ #!/bin/bash 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}/kiosk; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.desktop/deonly/yakuake b/ublinux/rc.desktop/deonly/yakuake index d6bba11..b476e9d 100755 --- a/ublinux/rc.desktop/deonly/yakuake +++ b/ublinux/rc.desktop/deonly/yakuake @@ -1,9 +1,9 @@ #!/bin/sh 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 diff --git a/ublinux/rc.domain.d/30-usershwaccess b/ublinux/rc.domain.d/30-usershwaccess index 750ba40..a6f5732 100755 --- a/ublinux/rc.domain.d/30-usershwaccess +++ b/ublinux/rc.domain.d/30-usershwaccess @@ -1,10 +1,10 @@ #!/bin/bash ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 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 diff --git a/ublinux/rc.halt.pre/01-sysrq-sleepshutdown b/ublinux/rc.halt.pre/01-sysrq-sleepshutdown index dd8aecd..dcda82a 100755 --- a/ublinux/rc.halt.pre/01-sysrq-sleepshutdown +++ b/ublinux/rc.halt.pre/01-sysrq-sleepshutdown @@ -1,7 +1,7 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 #echo "Sleep 60 sec to reboot /proc/sysrq-trigger" #echo 1 > /proc/sys/kernel/sysrq diff --git a/ublinux/rc.halt.pre/10-shutdown b/ublinux/rc.halt.pre/10-shutdown index 430cf2c..cd2bc81 100755 --- a/ublinux/rc.halt.pre/10-shutdown +++ b/ublinux/rc.halt.pre/10-shutdown @@ -1,7 +1,7 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 #HALTPROCESSESKILL="slim kdm X lxdm xdm sddm cupsd pdnsd mc mandb" HALTPROCESSESKILL="" @@ -9,9 +9,10 @@ HALTSERVICESSTOP="" HALTEXCLUDESTOP="" 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}/system; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/desktop; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.halt.pre/15-cleanup b/ublinux/rc.halt.pre/15-cleanup index da58dc5..4315727 100755 --- a/ublinux/rc.halt.pre/15-cleanup +++ b/ublinux/rc.halt.pre/15-cleanup @@ -1,7 +1,7 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 # some cleanups rm -fr /tmp/* /mnt/live/memory/changes/usr/share/apps/ksplash/Themes/Default 2>/dev/null diff --git a/ublinux/rc.halt.pre/20-grub b/ublinux/rc.halt.pre/20-grub index 0f69b9e..6f87001 100755 --- a/ublinux/rc.halt.pre/20-grub +++ b/ublinux/rc.halt.pre/20-grub @@ -1,12 +1,12 @@ #!/usr/bin/env bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.halt.pre/70-savetomodule b/ublinux/rc.halt.pre/70-savetomodule index f95896c..3817cab 100755 --- a/ublinux/rc.halt.pre/70-savetomodule +++ b/ublinux/rc.halt.pre/70-savetomodule @@ -1,13 +1,14 @@ #!/bin/bash ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 #grep -q 1 /run/ublinux_started || exit 0 . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null +SOURCE=${SYSCONF}/system; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SAVETOMODULEOPTIONS="$MKSQFS_FASTALG" diff --git a/ublinux/rc.halt.pre/75-save-cache b/ublinux/rc.halt.pre/75-save-cache index 62637d9..18ad536 100755 --- a/ublinux/rc.halt.pre/75-save-cache +++ b/ublinux/rc.halt.pre/75-save-cache @@ -1,9 +1,9 @@ #!/usr/bin/env bash 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}/save; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/network; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.halt.pre/76-save-rootcopy b/ublinux/rc.halt.pre/76-save-rootcopy index 5b0525f..050b160 100755 --- a/ublinux/rc.halt.pre/76-save-rootcopy +++ b/ublinux/rc.halt.pre/76-save-rootcopy @@ -1,12 +1,12 @@ #!/usr/bin/env bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.halt.pre/80-upgrade b/ublinux/rc.halt.pre/80-upgrade index 5433314..ce83f0e 100755 --- a/ublinux/rc.halt.pre/80-upgrade +++ b/ublinux/rc.halt.pre/80-upgrade @@ -1,11 +1,11 @@ #!/usr/bin/env bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 #grep -q 1 /run/ublinux_started || exit 0 #. /usr/lib/ublinux/functions -#. /usr/lib/ublinux/os-config +#. /usr/lib/ublinux/default #SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.halt.pre/85-chmod b/ublinux/rc.halt.pre/85-chmod index bf6c997..e2589bb 100755 --- a/ublinux/rc.halt.pre/85-chmod +++ b/ublinux/rc.halt.pre/85-chmod @@ -1,7 +1,7 @@ #!/usr/bin/env bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 chmod_ublinux() { local PATH_UBLINUX=$1 diff --git a/ublinux/rc.halt.pre/90-deactivate b/ublinux/rc.halt.pre/90-deactivate index 9d50555..054551e 100755 --- a/ublinux/rc.halt.pre/90-deactivate +++ b/ublinux/rc.halt.pre/90-deactivate @@ -1,7 +1,7 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 PATH=/usr/lib/ublinux/scripts:${PATH} EXT="ubm" diff --git a/ublinux/rc.halt.pre/95-umount b/ublinux/rc.halt.pre/95-umount index 7e63eb4..430d36d 100755 --- a/ublinux/rc.halt.pre/95-umount +++ b/ublinux/rc.halt.pre/95-umount @@ -1,7 +1,7 @@ #!/usr/bin/env bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 PATH=/usr/lib/ublinux/scripts:$PATH diff --git a/ublinux/rc.halt/20-timesave b/ublinux/rc.halt/20-timesave index 156e456..e18436f 100755 --- a/ublinux/rc.halt/20-timesave +++ b/ublinux/rc.halt/20-timesave @@ -3,7 +3,7 @@ ENABLED=yes [[ ${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 [[ ${HALTSAVETIME,,} =~ ^no$|^off$|^disable$ ]] && exit 0 diff --git a/ublinux/rc.local.d/01-background b/ublinux/rc.local.d/01-background index 6b67e7a..5aca058 100755 --- a/ublinux/rc.local.d/01-background +++ b/ublinux/rc.local.d/01-background @@ -1,11 +1,11 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default debug_mode "$0" "$@" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.local.d/10-sudoers b/ublinux/rc.local.d/10-sudoers index 12f2c03..4654a8f 100755 --- a/ublinux/rc.local.d/10-sudoers +++ b/ublinux/rc.local.d/10-sudoers @@ -1,14 +1,14 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no ALLOWEDSUDO=ldconfig,ubupdate,ntpdate PATH=/usr/lib/ublinux/scripts:/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/local/sbin: . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.local.d/31-sound b/ublinux/rc.local.d/31-sound index 2c039bd..a25c093 100755 --- a/ublinux/rc.local.d/31-sound +++ b/ublinux/rc.local.d/31-sound @@ -1,7 +1,7 @@ #!/bin/bash ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no 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" . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /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 # in case of card 0 is HDMI, card 1 is audiocard if [ "$SNDFINCARD" != "no" ] ;then diff --git a/ublinux/rc.local.d/41-x11vnc b/ublinux/rc.local.d/41-x11vnc index 3e7a2d2..6c2d042 100755 --- a/ublinux/rc.local.d/41-x11vnc +++ b/ublinux/rc.local.d/41-x11vnc @@ -5,7 +5,7 @@ ENABLED=yes DEBUGMODE=no 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}/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 c019992..83663b7 100755 --- a/ublinux/rc.local.d/42-domain_join +++ b/ublinux/rc.local.d/42-domain_join @@ -1,11 +1,11 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no 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}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.local.d/50-update-cache-gdk-pixbuf b/ublinux/rc.local.d/50-update-cache-gdk-pixbuf index fd74d3c..f92adef 100755 --- a/ublinux/rc.local.d/50-update-cache-gdk-pixbuf +++ b/ublinux/rc.local.d/50-update-cache-gdk-pixbuf @@ -1,7 +1,7 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no debug_mode "$0" "$@" diff --git a/ublinux/rc.local.d/50-update-cache-gtk-icon b/ublinux/rc.local.d/50-update-cache-gtk-icon index b96fab6..949f3d8 100755 --- a/ublinux/rc.local.d/50-update-cache-gtk-icon +++ b/ublinux/rc.local.d/50-update-cache-gtk-icon @@ -1,13 +1,13 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no UPDATEGTKICONOPTS="-fit /usr/share/icons/hicolor" . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default debug_mode "$0" "$@" #[ "$UPDATEGTKICONCACHE" != "no" ] && [ -d "/usr/share/icons/hicolor/" ] && gtk-update-icon-cache $UPDATEGTKICONOPTS >/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 3ae641c..9466a93 100755 --- a/ublinux/rc.local.d/50-update-desktop-database +++ b/ublinux/rc.local.d/50-update-desktop-database @@ -1,10 +1,10 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no #. /usr/lib/ublinux/functions -#. /usr/lib/ublinux/os-config +#. /usr/lib/ublinux/default debug_mode "$0" "$@" if [ -d "/usr/share/applications/" -o -d "/usr/local/share/applications/" ]; then diff --git a/ublinux/rc.local.d/50-update-glib-compile-schemas b/ublinux/rc.local.d/50-update-glib-compile-schemas index 8b45cfc..0c02164 100755 --- a/ublinux/rc.local.d/50-update-glib-compile-schemas +++ b/ublinux/rc.local.d/50-update-glib-compile-schemas @@ -1,10 +1,10 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no #. /usr/lib/ublinux/functions -#. /usr/lib/ublinux/os-config +#. /usr/lib/ublinux/default debug_mode "$0" "$@" [ -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 0488076..c64c0e9 100755 --- a/ublinux/rc.local.d/50-update-mime +++ b/ublinux/rc.local.d/50-update-mime @@ -1,10 +1,10 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no #. /usr/lib/ublinux/functions -#. /usr/lib/ublinux/os-config +#. /usr/lib/ublinux/default debug_mode "$0" "$@" [ -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 ec5ea29..80fb296 100755 --- a/ublinux/rc.local.d/51-mozilla_extensions +++ b/ublinux/rc.local.d/51-mozilla_extensions @@ -1,11 +1,11 @@ #!/bin/bash ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default debug_mode "$0" "$@" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.local.d/52-consolesetup b/ublinux/rc.local.d/52-consolesetup index 613b527..887612b 100755 --- a/ublinux/rc.local.d/52-consolesetup +++ b/ublinux/rc.local.d/52-consolesetup @@ -5,7 +5,7 @@ ENABLED=yes 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/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}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.local.d/54-plymouth b/ublinux/rc.local.d/54-plymouth index dc4fb13..903b272 100755 --- a/ublinux/rc.local.d/54-plymouth +++ b/ublinux/rc.local.d/54-plymouth @@ -1,10 +1,10 @@ #!/usr/bin/env bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null debug_mode "$0" "$@" diff --git a/ublinux/rc.local.d/55-x2go b/ublinux/rc.local.d/55-x2go index dcb179a..bbe0313 100755 --- a/ublinux/rc.local.d/55-x2go +++ b/ublinux/rc.local.d/55-x2go @@ -1,10 +1,10 @@ #!/usr/bin/env bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no #. /usr/lib/ublinux/functions -#. /usr/lib/ublinux/os-config +#. /usr/lib/ublinux/default debug_mode "$0" "$@" diff --git a/ublinux/rc.local.d/91-cts b/ublinux/rc.local.d/91-cts index cc051a6..ad6c93b 100755 --- a/ublinux/rc.local.d/91-cts +++ b/ublinux/rc.local.d/91-cts @@ -4,7 +4,7 @@ # ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no #. /usr/lib/ublinux/functions debug_mode "$0" "$@" diff --git a/ublinux/rc.local.d/91-eula b/ublinux/rc.local.d/91-eula index 2e351d2..b9cfed8 100755 --- a/ublinux/rc.local.d/91-eula +++ b/ublinux/rc.local.d/91-eula @@ -1,17 +1,12 @@ #!/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" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 #PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin DEBUGMODE=no #. usr/lib/ublinux/functions -#. usr/lib/ublinux/os-config +#. usr/lib/ublinux/default EULA_DB="/usr/share/ublinux/agreement/EULA_DB.txt" EULA="/usr/share/ublinux/agreement/EULA.txt" debug_mode "$0" "$@" diff --git a/ublinux/rc.local.d/99-1c-enterprise b/ublinux/rc.local.d/99-1c-enterprise index 36e46fc..1d772b9 100755 --- a/ublinux/rc.local.d/99-1c-enterprise +++ b/ublinux/rc.local.d/99-1c-enterprise @@ -4,7 +4,7 @@ # ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no #. /usr/lib/ublinux/functions #debug_mode "$0" "$@" diff --git a/ublinux/rc.network.d/10-network b/ublinux/rc.network.d/10-network index 5a97e6a..06de437 100755 --- a/ublinux/rc.network.d/10-network +++ b/ublinux/rc.network.d/10-network @@ -5,7 +5,7 @@ ENABLED=yes DEBUGMODE=no 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}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.network.d/81-samba b/ublinux/rc.network.d/81-samba index 2c033fd..8bd265e 100755 --- a/ublinux/rc.network.d/81-samba +++ b/ublinux/rc.network.d/81-samba @@ -2,7 +2,7 @@ # Description: This script will generate initial passwords for samba users ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no # Machine only @@ -11,7 +11,7 @@ SMBUSERS=$(grep ^users: /etc/group | awk -F: '{print $4}' | tr ';,' ' ') SMBGUEST="yes" . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default debug_mode "$0" "$@" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.network.d/90-ublinuxupdate b/ublinux/rc.network.d/90-ublinuxupdate index 511f3a7..22f4f7e 100755 --- a/ublinux/rc.network.d/90-ublinuxupdate +++ b/ublinux/rc.network.d/90-ublinuxupdate @@ -1,15 +1,15 @@ #!/bin/bash - # Description: This script will generate - ENABLED= -[ "$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 echo $UBLINUXUPDATE | grep -qi ^auto$ || exit 0 diff --git a/ublinux/rc.post.d/01-system b/ublinux/rc.post.d/01-system index 63b31e3..f6182ad 100755 --- a/ublinux/rc.post.d/01-system +++ b/ublinux/rc.post.d/01-system @@ -1,11 +1,11 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default debug_mode "$0" "$@" # sysctl variables diff --git a/ublinux/rc.post.d/02-hwclock b/ublinux/rc.post.d/02-hwclock index aac8c6a..05803f7 100755 --- a/ublinux/rc.post.d/02-hwclock +++ b/ublinux/rc.post.d/02-hwclock @@ -6,7 +6,7 @@ DEBUGMODE=no 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.post.d/03-modprobepreload b/ublinux/rc.post.d/03-modprobepreload index 639c0d1..47482d2 100755 --- a/ublinux/rc.post.d/03-modprobepreload +++ b/ublinux/rc.post.d/03-modprobepreload @@ -1,10 +1,10 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default debug_mode "$0" "$@" [ "$MODPROBEPRELOAD" = "no" ] && exit 0 diff --git a/ublinux/rc.post.d/09-automount b/ublinux/rc.post.d/09-automount index a1c6824..e198c23 100755 --- a/ublinux/rc.post.d/09-automount +++ b/ublinux/rc.post.d/09-automount @@ -8,7 +8,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.post.d/10-brand-backgrounds b/ublinux/rc.post.d/10-brand-backgrounds index c5f3c13..07d9394 100755 --- a/ublinux/rc.post.d/10-brand-backgrounds +++ b/ublinux/rc.post.d/10-brand-backgrounds @@ -43,11 +43,11 @@ ## При запуске в ручную, получим изображения в каталоге: /tmp/ublinux_bg ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default debug_mode "$0" "$@" 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) # $(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="1920x1080" } diff --git a/ublinux/rc.post.d/11-xorg b/ublinux/rc.post.d/11-xorg index 7df94de..ebe596b 100755 --- a/ublinux/rc.post.d/11-xorg +++ b/ublinux/rc.post.d/11-xorg @@ -5,7 +5,7 @@ ENABLED=yes DEBUGMODE=no 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" "$@" #. $HARDCONF diff --git a/ublinux/rc.post.d/12-dm-background b/ublinux/rc.post.d/12-dm-background index 5ccd73c..2c3255b 100755 --- a/ublinux/rc.post.d/12-dm-background +++ b/ublinux/rc.post.d/12-dm-background @@ -5,7 +5,7 @@ ENABLED=yes DEBUGMODE=no 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" "$@" 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 880d26a..28abf57 100755 --- a/ublinux/rc.post.d/16-kiosk-desktop +++ b/ublinux/rc.post.d/16-kiosk-desktop @@ -5,7 +5,7 @@ ENABLED=yes DEBUGMODE=no 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" "$@" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/17-kiosk-gtk b/ublinux/rc.post.d/17-kiosk-gtk index 57313aa..ecdd089 100755 --- a/ublinux/rc.post.d/17-kiosk-gtk +++ b/ublinux/rc.post.d/17-kiosk-gtk @@ -5,7 +5,7 @@ ENABLED=yes DEBUGMODE=no 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" "$@" 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 901a84f..87dbd36 100755 --- a/ublinux/rc.post.d/18-kiosk-xfce4-kioskrc +++ b/ublinux/rc.post.d/18-kiosk-xfce4-kioskrc @@ -5,7 +5,7 @@ ENABLED=yes DEBUGMODE=no 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" "$@" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/20-initrd b/ublinux/rc.post.d/20-initrd index 1d44e76..e77e105 100755 --- a/ublinux/rc.post.d/20-initrd +++ b/ublinux/rc.post.d/20-initrd @@ -1,7 +1,7 @@ #!/bin/bash ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no . /usr/lib/ublinux/functions diff --git a/ublinux/rc.post.d/23-publicdir b/ublinux/rc.post.d/23-publicdir index b28816d..08c4bdd 100755 --- a/ublinux/rc.post.d/23-publicdir +++ b/ublinux/rc.post.d/23-publicdir @@ -1,15 +1,16 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default debug_mode "$0" "$@" 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#/*} diff --git a/ublinux/rc.post.d/30-network b/ublinux/rc.post.d/30-network index affa2b9..95ed252 100755 --- a/ublinux/rc.post.d/30-network +++ b/ublinux/rc.post.d/30-network @@ -1,11 +1,11 @@ #!/usr/bin/env bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no 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}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.post.d/35-soundprofile b/ublinux/rc.post.d/35-soundprofile index 99b8489..ecd1301 100755 --- a/ublinux/rc.post.d/35-soundprofile +++ b/ublinux/rc.post.d/35-soundprofile @@ -1,14 +1,15 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /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 [ -z "$PULSEAUDIO" ] && PULSEAUDIO=default diff --git a/ublinux/rc.post.d/42-access-suid-sgid b/ublinux/rc.post.d/42-access-suid-sgid index e66317c..b3b74bc 100755 --- a/ublinux/rc.post.d/42-access-suid-sgid +++ b/ublinux/rc.post.d/42-access-suid-sgid @@ -1,14 +1,14 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no SELF_NAME="42-access-suid-sgid" 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.post.d/43-access-exec b/ublinux/rc.post.d/43-access-exec index 277ab40..980eea6 100755 --- a/ublinux/rc.post.d/43-access-exec +++ b/ublinux/rc.post.d/43-access-exec @@ -1,12 +1,12 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.post.d/44-mountattr b/ublinux/rc.post.d/44-mountattr index ed59bca..78020ef 100755 --- a/ublinux/rc.post.d/44-mountattr +++ b/ublinux/rc.post.d/44-mountattr @@ -1,12 +1,12 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.post.d/45-disk-quota b/ublinux/rc.post.d/45-disk-quota index 0885c40..ad17abb 100755 --- a/ublinux/rc.post.d/45-disk-quota +++ b/ublinux/rc.post.d/45-disk-quota @@ -1,12 +1,12 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" @@ -96,11 +96,11 @@ exec_disk_quota(){ true fi if [[ -z ${ROOTFS} ]]; then - /usr/bin/ubconfig --quiet --source system get config SERVICESSTART | grep -q systemd-quotacheck 2>/dev/null \ - || /usr/bin/ubconfig --quiet --target system set config SERVICESSTART+=,systemd-quotacheck + /usr/bin/ubconfig --quiet --source system get system SERVICESSTART | grep -q systemd-quotacheck 2>/dev/null \ + || /usr/bin/ubconfig --quiet --target system set system SERVICESSTART+=,systemd-quotacheck else - chroot . /usr/bin/ubconfig --quiet --source system get config SERVICESSTART | grep -q systemd-quotacheck 2>/dev/null \ - || /usr/bin/ubconfig --quiet --noexecute --target system set config SERVICESSTART+=,systemd-quotacheck + 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 system SERVICESSTART+=,systemd-quotacheck fi else [[ -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 if [[ ${ATTR_QUOTA} == quota ]]; 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 - 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 cat /proc/mounts | grep -q "${PATH_DEVICE}.*${ATTR_QUOTA}" && mount -o remount,noquota ${PATH_DEVICE} &>/dev/null fi @@ -277,7 +277,7 @@ exec_disk_quota(){ ${ROOTFS}/usr/bin/quotaoff -augP 2>/dev/null ${ROOTFS}/usr/bin/quotacheck -aug 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 elif [[ ${ALL_VALUE_QUOTA,,} == disable ]]; then @@ -286,7 +286,7 @@ exec_disk_quota(){ else disable_quota ${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 elif [[ ${ALL_VALUE_QUOTA,,} == clean ]]; then [[ -n ${PATH_DEVICE} ]] && clean_quota diff --git a/ublinux/rc.post.d/46-cgroup-quota b/ublinux/rc.post.d/46-cgroup-quota index 8975961..39af92c 100755 --- a/ublinux/rc.post.d/46-cgroup-quota +++ b/ublinux/rc.post.d/46-cgroup-quota @@ -1,12 +1,12 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" @@ -63,8 +63,8 @@ exec_cgroup_quota_remove(){ if [[ -z $@ || $1 == set ]]; then shift - exec_cgroup_quota_set $@ + exec_cgroup_quota_set "$@" elif [[ $1 == remove ]]; then shift - exec_cgroup_quota_remove $@ + exec_cgroup_quota_remove "$@" fi diff --git a/ublinux/rc.post.d/50-update-fonts b/ublinux/rc.post.d/50-update-fonts index 205535e..45a73d7 100755 --- a/ublinux/rc.post.d/50-update-fonts +++ b/ublinux/rc.post.d/50-update-fonts @@ -1,10 +1,10 @@ #!/bin/bash ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no #. /usr/lib/ublinux/functions -#. /usr/lib/ublinux/os-config +#. /usr/lib/ublinux/default debug_mode "$0" "$@" #for font_dir in /usr/share/fonts{,/default}/TTF /usr/X11R6/lib/X11/fonts/TTF; do diff --git a/ublinux/rc.post.d/51-theme b/ublinux/rc.post.d/51-theme index ea0897d..4541418 100755 --- a/ublinux/rc.post.d/51-theme +++ b/ublinux/rc.post.d/51-theme @@ -1,11 +1,11 @@ #!/bin/bash ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default debug_mode "$0" "$@" DIRGTK=gtk-2.0 diff --git a/ublinux/rc.post.d/60-blacklistdkms b/ublinux/rc.post.d/60-blacklistdkms index ec531b0..7051adb 100755 --- a/ublinux/rc.post.d/60-blacklistdkms +++ b/ublinux/rc.post.d/60-blacklistdkms @@ -1,11 +1,11 @@ #!/bin/bash ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default debug_mode "$0" "$@" WHITELISTMODULES="$(cmdline_value whitelist | tr ',;' ' ')" diff --git a/ublinux/rc.post.d/90-kesl b/ublinux/rc.post.d/90-kesl index 3dea0f2..05039c5 100755 --- a/ublinux/rc.post.d/90-kesl +++ b/ublinux/rc.post.d/90-kesl @@ -1,7 +1,7 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 if [ -d /var/opt/kaspersky ] ;then if [ -d /mnt/livedata/ublinux-data ] ;then diff --git a/ublinux/rc.post/01-system b/ublinux/rc.post/01-system index fd9cd74..c89e3da 100755 --- a/ublinux/rc.post/01-system +++ b/ublinux/rc.post/01-system @@ -1,7 +1,7 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no . /usr/lib/ublinux/functions debug_mode "$0" "$@" diff --git a/ublinux/rc.post/10-ldconfig b/ublinux/rc.post/10-ldconfig index e44ad7c..153a986 100755 --- a/ublinux/rc.post/10-ldconfig +++ b/ublinux/rc.post/10-ldconfig @@ -1,10 +1,10 @@ #!/bin/bash ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null debug_mode "$0" "$@" diff --git a/ublinux/rc.post/20-plymouth b/ublinux/rc.post/20-plymouth index 71411d8..89e5c1f 100755 --- a/ublinux/rc.post/20-plymouth +++ b/ublinux/rc.post/20-plymouth @@ -1,7 +1,7 @@ #!/bin/bash ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no debug_mode "$0" "$@" diff --git a/ublinux/rc.post/30-selinux b/ublinux/rc.post/30-selinux index e121206..fae0d37 100755 --- a/ublinux/rc.post/30-selinux +++ b/ublinux/rc.post/30-selinux @@ -1,7 +1,7 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no debug_mode "$0" "$@" diff --git a/ublinux/rc.preinit.d/01-depmod b/ublinux/rc.preinit.d/01-depmod index 0888a13..6d216ce 100755 --- a/ublinux/rc.preinit.d/01-depmod +++ b/ublinux/rc.preinit.d/01-depmod @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Linux Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for Linux UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -11,14 +11,16 @@ DEBUGMODE=no 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" 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 diff --git a/ublinux/rc.preinit.d/02-modulespreload b/ublinux/rc.preinit.d/02-modulespreload index e6ee3a2..1fd1197 100755 --- a/ublinux/rc.preinit.d/02-modulespreload +++ b/ublinux/rc.preinit.d/02-modulespreload @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Linux Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for Linux UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -11,7 +11,7 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin . usr/lib/ublinux/functions -. usr/lib/ublinux/os-config +. usr/lib/ublinux/default debug_mode "$0" "$@" diff --git a/ublinux/rc.preinit.d/03-ldconfig b/ublinux/rc.preinit.d/03-ldconfig index ae9b0a3..f263ec1 100755 --- a/ublinux/rc.preinit.d/03-ldconfig +++ b/ublinux/rc.preinit.d/03-ldconfig @@ -4,12 +4,13 @@ ENABLED=yes [[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no -. usr/lib/ublinux/functions -. usr/lib/ublinux/os-config +[[ -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/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 debug_mode "$0" "$@" -echo $SYSCONF | grep -q ^/ && SYSCONF=.$SYSCONF -SOURCE=${SYSCONF}/config; [ -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 -#[ "$RUNLDCONFIG" = "yes" ] && /usr/bin/ldconfig -chroot . /usr/bin/ldconfig 2>&1 &>/dev/null + [[ ${RUNLDCONFIG} == @(yes|y) ]] && ${CMD_CHROOT} /usr/bin/ldconfig 2>&1 &>/dev/null diff --git a/ublinux/rc.preinit.d/10-system b/ublinux/rc.preinit.d/10-system index ad79118..509d7b0 100755 --- a/ublinux/rc.preinit.d/10-system +++ b/ublinux/rc.preinit.d/10-system @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # 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}"; } 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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -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 exec_linklivedata(){ diff --git a/ublinux/rc.preinit.d/11-partitions b/ublinux/rc.preinit.d/11-partitions index 0918acf..cb13df5 100755 --- a/ublinux/rc.preinit.d/11-partitions +++ b/ublinux/rc.preinit.d/11-partitions @@ -1,22 +1,23 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin DEBUGMODE=no #. usr/lib/ublinux/scripts/liblinuxlive . usr/lib/ublinux/functions -. usr/lib/ublinux/os-config +. usr/lib/ublinux/default debug_mode "$0" "$@" echo $SYSCONF | grep -q ^/ && SYSCONF=.$SYSCONF SOURCE=${SYSCONF}/config; [ -f "${SOURCE}" ] && . ${SOURCE} 2>/dev/null +SOURCE=${SYSCONF}/mount; [ -f "${SOURCE}" ] && . ${SOURCE} 2>/dev/null get_name() { diff --git a/ublinux/rc.preinit.d/12-save2module b/ublinux/rc.preinit.d/12-save2module index feaf30a..f863a84 100755 --- a/ublinux/rc.preinit.d/12-save2module +++ b/ublinux/rc.preinit.d/12-save2module @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs diff --git a/ublinux/rc.preinit.d/13-release b/ublinux/rc.preinit.d/13-release index c005eab..bab46df 100755 --- a/ublinux/rc.preinit.d/13-release +++ b/ublinux/rc.preinit.d/13-release @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs diff --git a/ublinux/rc.preinit.d/20-services b/ublinux/rc.preinit.d/20-services index b1e4d76..d4911b4 100755 --- a/ublinux/rc.preinit.d/20-services +++ b/ublinux/rc.preinit.d/20-services @@ -1,49 +1,227 @@ -#!/usr/bin/env bash +#!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs ENABLED=yes [[ ${ENABLED} == "yes" ]] || exit 0 +DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin -DEBUGMODE=no -. usr/lib/ublinux/functions -. usr/lib/ublinux/os-config + +[[ -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/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 debug_mode "$0" "$@" -echo $SYSCONF | grep -q ^/ && SYSCONF=.$SYSCONF -SOURCE=${SYSCONF}/config; [ -f "${SOURCE}" ] && . ${SOURCE} 2>/dev/null - -[ -z "$(cmdline_value servicesstart)" ] || SERVICESSTART=$(cmdline_value servicesstart) -[ -z "$(cmdline_value servicesnostart)" ] || SERVICESNOSTART=$(cmdline_value servicesnostart) - -if [ ! -z "$SERVICESSTART$SERVICESNOSTART$SERVICESMASK$SERVICESUNMASK" ] ;then - mkdir -p 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 - done - for a in $(echo $SERVICESNOSTART | tr , " ") ;do - if [ $ISSYSTEMD ] ;then - chroot . systemctl disable $a || true - else - true - fi - done - for a in $(echo $SERVICESMASK | tr , " ") ;do - [ $ISSYSTEMD ] && chroot . systemctl disable $a - [ $ISSYSTEMD ] && chroot . systemctl mask $a - done - umount proc -fi +SYSCONF="${ROOTFS}/${SYSCONF}" +SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SOURCE=${SYSCONF}/system; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null + +exec_copy_to_initd(){ +# Функция создания симлинка в /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") +} + +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 + mount -o rbind /proc proc + fi + while IFS= read -ru3 SELECT_SERVICE; do + [[ -n ${SELECT_SERVICE} ]] || continue + if [[ -n ${ISSYSTEMD} ]]; then + ${CMD_CHROOT} systemctl --quiet unmask ${SELECT_SERVICE} + 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[]=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 + eval ${FUNCTION#*; } + fi diff --git a/ublinux/rc.preinit.d/21-ntp b/ublinux/rc.preinit.d/21-ntp index 1175374..c2351cb 100755 --- a/ublinux/rc.preinit.d/21-ntp +++ b/ublinux/rc.preinit.d/21-ntp @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # 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 . '; } 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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.preinit.d/22-samba b/ublinux/rc.preinit.d/22-samba index 1e314e1..7bc3388 100755 --- a/ublinux/rc.preinit.d/22-samba +++ b/ublinux/rc.preinit.d/22-samba @@ -1,19 +1,19 @@ #!/usr/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.preinit.d/23-realmd b/ublinux/rc.preinit.d/23-realmd index 0f7c8b7..0e3ed80 100755 --- a/ublinux/rc.preinit.d/23-realmd +++ b/ublinux/rc.preinit.d/23-realmd @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -13,7 +13,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.preinit.d/30-network-hostname b/ublinux/rc.preinit.d/30-network-hostname index 181a14d..bef6922 100755 --- a/ublinux/rc.preinit.d/30-network-hostname +++ b/ublinux/rc.preinit.d/30-network-hostname @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -14,7 +14,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" @@ -57,7 +57,6 @@ exec_hostname(){ fi ## Имя хоста записать в конфиг с постфиксом домена - [[ -f ${ROOTFS}/etc/ublinux/config ]] && { grep -q "^\s*HOSTNAME=${SET_HOSTNAME}\s*$" ${ROOTFS}/etc/ublinux/config || sed "s/^\s*HOSTNAME=.*/HOSTNAME=${SET_HOSTNAME}/g" -i ${ROOTFS}/etc/ublinux/config; } [[ -f ${ROOTFS}/etc/ublinux/system ]] && { grep -q "^\s*HOSTNAME=${SET_HOSTNAME}\s*$" ${ROOTFS}/etc/ublinux/system || sed "s/^\s*HOSTNAME=.*/HOSTNAME=${SET_HOSTNAME}/g" -i ${ROOTFS}/etc/ublinux/system; } else echo "${SET_HOSTNAME}" > ${ROOTFS}/etc/hostname diff --git a/ublinux/rc.preinit.d/31-network-proxy-system b/ublinux/rc.preinit.d/31-network-proxy-system index 9fcffbc..3bf7fc2 100755 --- a/ublinux/rc.preinit.d/31-network-proxy-system +++ b/ublinux/rc.preinit.d/31-network-proxy-system @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -13,7 +13,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.preinit.d/32-network b/ublinux/rc.preinit.d/32-network index 0d3ccdd..91746a2 100755 --- a/ublinux/rc.preinit.d/32-network +++ b/ublinux/rc.preinit.d/32-network @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # 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 . '; } 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" "$@" HOSTNAME=ublinux-live diff --git a/ublinux/rc.preinit.d/35-iptables b/ublinux/rc.preinit.d/35-iptables index bacf331..ad7ce35 100755 --- a/ublinux/rc.preinit.d/35-iptables +++ b/ublinux/rc.preinit.d/35-iptables @@ -1,17 +1,17 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin DEBUGMODE=no . usr/lib/ublinux/functions -. usr/lib/ublinux/os-config +. usr/lib/ublinux/default debug_mode "$0" "$@" echo $SYSCONF | grep -q ^/ && SYSCONF=.$SYSCONF diff --git a/ublinux/rc.preinit.d/36-ufw b/ublinux/rc.preinit.d/36-ufw index 06aee32..1aed295 100755 --- a/ublinux/rc.preinit.d/36-ufw +++ b/ublinux/rc.preinit.d/36-ufw @@ -1,17 +1,17 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin DEBUGMODE=no . usr/lib/ublinux/functions -. usr/lib/ublinux/os-config +. usr/lib/ublinux/default debug_mode "$0" "$@" echo $SYSCONF | grep -q ^/ && SYSCONF=.$SYSCONF diff --git a/ublinux/rc.preinit.d/40-authpam b/ublinux/rc.preinit.d/40-authpam index ffb425b..97f39ec 100755 --- a/ublinux/rc.preinit.d/40-authpam +++ b/ublinux/rc.preinit.d/40-authpam @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # 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 . '; } 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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" @@ -22,7 +22,8 @@ SOURCE=${SYSCONF}/system; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null [[ -n $1 && -n $2 ]] && AUTHPAM[$1]="$2" if [[ -n ${AUTHPAM[@]} && ${AUTHPAM[@],,} != @(disable|no|none|off) ]]; then - AUTHPAM_PROFILE=$(grep -h '^AUTHPAM\[' ${ROOTFS}/usr/lib/ublinux/os-config ${ROOTFS}/etc/ublinux/config | tail -1 | sed -E 's/AUTHPAM\[([a-z]*)\].*/\1/') #' +# TODO: Сделать отработку по параметру загруженному, убрать парсинг + AUTHPAM_PROFILE=$(grep -h '^AUTHPAM\[' ${ROOTFS}/usr/lib/ublinux/default ${ROOTFS}/etc/ublinux/system | tail -1 | sed -E 's/AUTHPAM\[([a-z]*)\].*/\1/') #' PROFILE_FEATURE=$(tr ',;' " " <<< ${AUTHPAM[${AUTHPAM_PROFILE}]}) ${CMD_CHROOT} ${ROOTFS}/usr/bin/authselect select ${AUTHPAM_PROFILE} ${PROFILE_FEATURE} --force --nobackup --quiet fi diff --git a/ublinux/rc.preinit.d/50-xorg b/ublinux/rc.preinit.d/50-xorg index 817c28a..b54b611 100755 --- a/ublinux/rc.preinit.d/50-xorg +++ b/ublinux/rc.preinit.d/50-xorg @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # 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 . '; } 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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.preinit.d/50-xorg-old b/ublinux/rc.preinit.d/50-xorg-old index 96b9ed5..f31555b 100755 --- a/ublinux/rc.preinit.d/50-xorg-old +++ b/ublinux/rc.preinit.d/50-xorg-old @@ -1,12 +1,12 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin @@ -33,7 +33,7 @@ DELETE_XORG_CONF=no DEBUGMODE=no . usr/lib/ublinux/functions -. usr/lib/ublinux/os-config +. usr/lib/ublinux/default debug_mode "$0" "$@" [ -f /memory/changes/etc/ld.so.cache ] && GLLDCONFIG=no diff --git a/ublinux/rc.preinit.d/51-autologin b/ublinux/rc.preinit.d/51-autologin index c34545e..1965e5d 100755 --- a/ublinux/rc.preinit.d/51-autologin +++ b/ublinux/rc.preinit.d/51-autologin @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # 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 . '; } 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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.preinit.d/52-desktop b/ublinux/rc.preinit.d/52-desktop index 522e5d4..a891df9 100755 --- a/ublinux/rc.preinit.d/52-desktop +++ b/ublinux/rc.preinit.d/52-desktop @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -12,7 +12,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" SYSCONF="${ROOTFS}${SYSCONF}" diff --git a/ublinux/rc.preinit.d/53-language b/ublinux/rc.preinit.d/53-language index a4dac91..f20fb78 100755 --- a/ublinux/rc.preinit.d/53-language +++ b/ublinux/rc.preinit.d/53-language @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # 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="/sysroot"; CMD_CHROOT="chroot ${ROOTFS}"; } 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" "$@" SYSCONF="${ROOTFS}${SYSCONF}" diff --git a/ublinux/rc.preinit.d/54-backgrounds b/ublinux/rc.preinit.d/54-backgrounds index 0a2be3b..e666938 100755 --- a/ublinux/rc.preinit.d/54-backgrounds +++ b/ublinux/rc.preinit.d/54-backgrounds @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -12,7 +12,7 @@ DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin . usr/lib/ublinux/functions -. usr/lib/ublinux/os-config +. usr/lib/ublinux/default debug_mode "$0" "$@" find /memory/layer-base/*/* -maxdepth 0 -iname "ublinux-data*.sgn" | while read location; do diff --git a/ublinux/rc.preinit.d/55-multiseat b/ublinux/rc.preinit.d/55-multiseat index 228d1eb..9bc2f40 100755 --- a/ublinux/rc.preinit.d/55-multiseat +++ b/ublinux/rc.preinit.d/55-multiseat @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -13,7 +13,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.preinit.d/56-openssl-engine b/ublinux/rc.preinit.d/56-openssl-engine index b5e9036..3b7d284 100755 --- a/ublinux/rc.preinit.d/56-openssl-engine +++ b/ublinux/rc.preinit.d/56-openssl-engine @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -13,7 +13,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.preinit.d/57-access-denied-vtx11 b/ublinux/rc.preinit.d/57-access-denied-vtx11 index 2260a59..62be5c0 100755 --- a/ublinux/rc.preinit.d/57-access-denied-vtx11 +++ b/ublinux/rc.preinit.d/57-access-denied-vtx11 @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -13,7 +13,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.preinit.d/58-access-login b/ublinux/rc.preinit.d/58-access-login index 9d7e368..95943fe 100755 --- a/ublinux/rc.preinit.d/58-access-login +++ b/ublinux/rc.preinit.d/58-access-login @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # 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="/sysroot"; CMD_CHROOT="chroot ${ROOTFS}"; } 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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.preinit.d/59-polkit b/ublinux/rc.preinit.d/59-polkit index bdfffea..9fa181d 100755 --- a/ublinux/rc.preinit.d/59-polkit +++ b/ublinux/rc.preinit.d/59-polkit @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -13,7 +13,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.preinit.d/63-xorg-dpi b/ublinux/rc.preinit.d/63-xorg-dpi index 4e3d270..f2f0bf2 100755 --- a/ublinux/rc.preinit.d/63-xorg-dpi +++ b/ublinux/rc.preinit.d/63-xorg-dpi @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -13,7 +13,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.preinit.d/70-virtualbox b/ublinux/rc.preinit.d/70-virtualbox index a8ec604..fe4b5d0 100755 --- a/ublinux/rc.preinit.d/70-virtualbox +++ b/ublinux/rc.preinit.d/70-virtualbox @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -13,7 +13,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" if grep -qi virtualbox /sys/devices/virtual/dmi/id/*name; then diff --git a/ublinux/rc.preinit.d/71-vmware b/ublinux/rc.preinit.d/71-vmware index 84163c3..7e3eb63 100755 --- a/ublinux/rc.preinit.d/71-vmware +++ b/ublinux/rc.preinit.d/71-vmware @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -13,7 +13,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" if grep -qi vmware /sys/devices/virtual/dmi/id/*name; then diff --git a/ublinux/rc.preinit.d/72-hyperv b/ublinux/rc.preinit.d/72-hyperv index 0745a2f..8b62c86 100755 --- a/ublinux/rc.preinit.d/72-hyperv +++ b/ublinux/rc.preinit.d/72-hyperv @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -13,7 +13,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" if grep -qi Microsoft /sys/devices/virtual/dmi/id/*vendor; then diff --git a/ublinux/rc.preinit.d/73-qemu b/ublinux/rc.preinit.d/73-qemu index 6ff8279..58dc85e 100755 --- a/ublinux/rc.preinit.d/73-qemu +++ b/ublinux/rc.preinit.d/73-qemu @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -13,7 +13,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" # if grep -qi qemu /sys/devices/virtual/dmi/id/*vendor; then diff --git a/ublinux/rc.preinit.d/80-server-containers-storage b/ublinux/rc.preinit.d/80-server-containers-storage index 636ce5f..67c339e 100755 --- a/ublinux/rc.preinit.d/80-server-containers-storage +++ b/ublinux/rc.preinit.d/80-server-containers-storage @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -13,7 +13,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.preinit.d/81-server-libvirt-storage b/ublinux/rc.preinit.d/81-server-libvirt-storage index 1b3f44c..7752872 100755 --- a/ublinux/rc.preinit.d/81-server-libvirt-storage +++ b/ublinux/rc.preinit.d/81-server-libvirt-storage @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # 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 . '; } 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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.preinit.d/90-apparmor b/ublinux/rc.preinit.d/90-apparmor index 18be4be..9441de0 100755 --- a/ublinux/rc.preinit.d/90-apparmor +++ b/ublinux/rc.preinit.d/90-apparmor @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -13,11 +13,12 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin [[ -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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null +SOURCE=${SYSCONF}/system; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SERVICEAPPARMOR="apparmor.service" diff --git a/ublinux/rc.preinit.d/99-osinstall b/ublinux/rc.preinit.d/99-osinstall index 1363947..542e02e 100755 --- a/ublinux/rc.preinit.d/99-osinstall +++ b/ublinux/rc.preinit.d/99-osinstall @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -13,7 +13,7 @@ DEBUGMODE=no 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/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" "$@" SYSCONF="${ROOTFS}/${SYSCONF}" diff --git a/ublinux/rc.preinit/01-inifile b/ublinux/rc.preinit/01-inifile index 140748b..75a7843 100755 --- a/ublinux/rc.preinit/01-inifile +++ b/ublinux/rc.preinit/01-inifile @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -13,7 +13,7 @@ PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin 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/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" "$@" SYSCONF="${ROOTFS}${SYSCONF}" @@ -30,7 +30,7 @@ SYSCONF="${ROOTFS}${SYSCONF}" touch ${FILE_CONFIG} zcat ${INIGZFILE} | grep -E '^DEFAULTPASSWD|^DEFAULTROOTPASSWD|^NEEDEDUSERS|^USERADD|^GROUPADD' > /tmp/.ublinux_accounts_credential while read LINE; do - if [[ ${LINE} =~ ^\[.*\] ]]; then + if [[ ${LINE} =~ ^'['.*']' ]]; then FILE_CONFIG=$(tr '[]' '|' <<< "${LINE}" | cut -d'|' -f2) FILE_CONFIG_MOD=$(tr '[]' '|' <<< "${LINE}" | cut -d'|' -f3 | tr -d ' ') PATH_FILE_CONFIG=${FILE_CONFIG%/*} @@ -41,20 +41,17 @@ SYSCONF="${ROOTFS}${SYSCONF}" [[ -e ${FILE_CONFIG} ]] || touch "${FILE_CONFIG}" chmod "${FILE_CONFIG_MOD}" "${FILE_CONFIG}" fi - elif [[ ${LINE} =~ ^\- ]]; then - LINE_NEW=$(sed 's/^-//' <<< "${LINE}") - ESC_LINE_NEW=$(sed 's/[^a-zA-Z0-9,._@%-]/\\&/g' <<< "${LINE_NEW}") - sed -E "/^${ESC_LINE_NEW}$/d" -i "${FILE_CONFIG}" - elif [[ ${LINE} =~ ^\| ]]; then - sed 's/^|//' <<< "${LINE}" >> "${FILE_CONFIG}" - elif [[ ${LINE} =~ ^\+ ]]; then - LINE_NEW=$(sed 's/^+//' <<< "${LINE}") - ESC_LINE_NEW=$(sed 's/[^a-zA-Z0-9,._@%-]/\\&/g' <<< "${LINE_NEW}") - grep -Eq "${ESC_LINE_NEW}" "${FILE_CONFIG}" || echo "${LINE_NEW}" >> "${FILE_CONFIG}" + elif [[ ${LINE:0:1} == '-' ]]; then + sed -E "/^${LINE:1}$/d" -i "${FILE_CONFIG}" + elif [[ ${LINE:0:1} == '|' ]]; then + echo "${LINE:1}" >> "${FILE_CONFIG}" + elif [[ ${LINE:0:1} == '+' ]]; then + ESC_LINE_NEW=$(sed 's/[^a-zA-Z0-9,_@%]/\\&/g' <<< "${LINE:1}") + grep -Eq "^${ESC_LINE_NEW}$" "${FILE_CONFIG}" || echo "${LINE:1}" >> "${FILE_CONFIG}" else NAME_VAR=$(cut -d= -f1 <<< "${LINE}") [[ -z ${NAME_VAR} ]] && continue - ESC_NAME_VAR=$(sed 's/[^a-zA-Z0-9,._@%-]/\\&/g' <<< "${NAME_VAR}") + ESC_NAME_VAR=$(sed 's/[^a-zA-Z0-9,_@%]/\\&/g' <<< "${NAME_VAR}") [[ -f ${FILE_CONFIG} ]] \ && grep -Eq "^\s*${ESC_NAME_VAR}=" "${FILE_CONFIG}" 2>/dev/null \ && sed -E "/^\s*${ESC_NAME_VAR}=/d" -i "${FILE_CONFIG}" diff --git a/ublinux/rc.preinit/02-skel-adds b/ublinux/rc.preinit/02-skel-adds index 7ab07e8..c4db171 100755 --- a/ublinux/rc.preinit/02-skel-adds +++ b/ublinux/rc.preinit/02-skel-adds @@ -1,7 +1,7 @@ #!/bin/bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs @@ -11,7 +11,7 @@ ENABLED=yes PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin DEBUGMODE=no . usr/lib/ublinux/functions -. usr/lib/ublinux/os-config +. usr/lib/ublinux/default debug_mode "$0" "$@" INSTALLDESKTOP="ubinstall;ubinstall.cli" diff --git a/ublinux/rc.preinit/03-initvars b/ublinux/rc.preinit/03-initvars index 3503435..4239421 100755 --- a/ublinux/rc.preinit/03-initvars +++ b/ublinux/rc.preinit/03-initvars @@ -1,16 +1,18 @@ #!/usr/bin/env bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # All system path must be relative, except initrd dirs ENABLED=yes [[ ${ENABLED} == "yes" ]] || exit 0 +DEBUGMODE=no PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin -DEBUGMODE=no + +[[ -d /usr/lib/ublinux ]] && { unset ROOTFS; unset CMD_CHROOT; } || { ROOTFS='.'; CMD_CHROOT='chroot . '; } debug_mode "$0" "$@" # Filter not variable sell symbols from param kernel - egrep -iv ".*-.*=.*|.*\..*=.*" etc/initvars > etc/initvars + grep -Eiv ".*-.*=.*|.*\..*=.*" ${ROOTFS}/etc/initvars > ${ROOTFS}/etc/initvars diff --git a/ublinux/rc.preinit/10-accounts b/ublinux/rc.preinit/10-accounts index 10551b2..071268a 100755 --- a/ublinux/rc.preinit/10-accounts +++ b/ublinux/rc.preinit/10-accounts @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# Initial script for Live operating system -# This script are launching before starting init from linux-live script. +# Initial script for UBLinux +# This script are launching before starting init from initrd script # Current dir allways must be set to root (/) # 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 . '; } 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" "$@" SYSCONF="${ROOTFS}${SYSCONF}" @@ -27,7 +27,8 @@ SOURCE=${SYSCONF}/system; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null FILE_GSHADOW="${ROOTFS}/etc/gshadow" FILE_ACCOUNTS_CREDENTIAL="/tmp/.ublinux_accounts_credential" - # /etc/shadow file format + # https://en.wikipedia.org/wiki/Crypt_(C) + # https://man.archlinux.org/man/core/libxcrypt/crypt.5.en # /etc/shadow file format # user:$6$.n.:17736:0:99999:7::: # [--] [----] [---] - [---] ---- # | | | | | |||+-----------> 9. Неиспользованный @@ -42,12 +43,26 @@ SOURCE=${SYSCONF}/system; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null # Если поле пароля содержит первый символ звездочку (*), то пользователь не сможет войти по паролю, но сможет другим способом (например по ключу через ssh) # Если поле пароля содержит первый символ восклицательный знак (!), то пользователь вообще не сможет войти, даже по ключу # Алгоритмы хеширования пароля: - # $1$ - MD5 - # $2a$ - Blowfish - # $2y$ - Eksblowfish - # $5$ - SHA-256 - # $6$ - SHA-512 - # $y$ - yescrypt + # (empty) # DES + # $_$ # BSDi + # $1$ # MD5 + # $2$ # bcrypt based on Blowfish + # $2a$ # Blowfish + # $2b$ # OpenBSD blowfish + # $2x$ # blowfish + # $2y$ # Eksblowfish + # $3$ # NTHASH + # $5$ # SHA-256 + # $6$ # SHA-512 + # $7$ # scrypt + # $md5$ # Solaris MD5 + # $sha1$ # PBKDF1 with SHA1 + # $gy$ # gost-yescrypt + # $y$ # yescrypt + # $argon2d$ # Argon2d + # $argon2i$ # Argon2i + # $argon2ds$ # Argon2ds + # $argon2id$ # Argon2id set_passwd(){ USER_NAME="${1}" USER_PASS="${2}" @@ -150,11 +165,13 @@ exec_set_root_pass(){ } exec_firststart(){ - # Autodetect firstboot - # Если пароли по умолчанию, то firstboot - grep -q "^root:${DEFAULTROOTPASSWD}:" ${ROOTFS}/etc/shadow \ - && grep -q "^$(cat ${ROOTFS}/etc/passwd | grep ".*:x:${ADMUID}:" | cut -d: -f1):${DEFAULTPASSWD}:" ${ROOTFS}/etc/shadow && touch ${SYSCONF}/firststart \ - || rm -f ${SYSCONF}/firststart + # Autodetect firststart + # Если пароли по умолчанию, то firststart + if ! grep -q "^FIRSTSTART$" ${SYSCONF}/config 2>/dev/null; then + grep -q "^root:${DEFAULTROOTPASSWD}:" ${ROOTFS}/etc/shadow \ + && grep -q "^$(grep ".*:x:${ADMUID}:" ${ROOTFS}/etc/passwd | cut -d: -f1):${DEFAULTPASSWD}:" ${ROOTFS}/etc/shadow \ + && echo "FIRSTSTART=yes" >> ${SYSCONF}/config + fi } exec_verify_passwd(){ diff --git a/ublinux/rc.xorg/00-envvars b/ublinux/rc.xorg/00-envvars index cdbb752..0419b43 100755 --- a/ublinux/rc.xorg/00-envvars +++ b/ublinux/rc.xorg/00-envvars @@ -1,7 +1,7 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 set -a eval "$(systemctl --user show-environment)" diff --git a/ublinux/rc.xorg/01-de-background b/ublinux/rc.xorg/01-de-background index 91a24a5..7efd85f 100755 --- a/ublinux/rc.xorg/01-de-background +++ b/ublinux/rc.xorg/01-de-background @@ -3,7 +3,7 @@ ENABLED=yes [[ ${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}/users; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/desktop; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null @@ -122,7 +122,7 @@ if [ -x /usr/bin/convert ] ;then fi # placing warning about default passwords if [ "$GRAFFITI" != "no" -a -x /usr/bin/composite ] ;then - . /usr/lib/ublinux/os-config + . /usr/lib/ublinux/default A=0 grep -q "^root:$DEFAULTROOTPASSWD:" /etc/shadow && A=1 grep -q "^user:$DEFAULTPASSWD:" /etc/shadow && A=1 diff --git a/ublinux/rc.xorg/02-xrandr b/ublinux/rc.xorg/02-xrandr index 9850a47..cabe624 100755 --- a/ublinux/rc.xorg/02-xrandr +++ b/ublinux/rc.xorg/02-xrandr @@ -1,11 +1,11 @@ #!/usr/bin/env bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 DEBUGMODE=no . /usr/lib/ublinux/functions -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default debug_mode "$0" "$@" SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.xorg/10-fixkeyboard_layout b/ublinux/rc.xorg/10-fixkeyboard_layout index fc8f987..6da4383 100755 --- a/ublinux/rc.xorg/10-fixkeyboard_layout +++ b/ublinux/rc.xorg/10-fixkeyboard_layout @@ -5,7 +5,7 @@ ENABLED=yes 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/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}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.xorg/20-video-xorg-dpi b/ublinux/rc.xorg/20-video-xorg-dpi index 23ff60d..274c72b 100755 --- a/ublinux/rc.xorg/20-video-xorg-dpi +++ b/ublinux/rc.xorg/20-video-xorg-dpi @@ -5,7 +5,7 @@ ENABLED=yes 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/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}" SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.xorg/50-domain_join b/ublinux/rc.xorg/50-domain_join index 58b73c3..e2cf6e2 100755 --- a/ublinux/rc.xorg/50-domain_join +++ b/ublinux/rc.xorg/50-domain_join @@ -2,9 +2,9 @@ # to be sourced 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}/network; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null diff --git a/ublinux/rc.xorg/60-checknet b/ublinux/rc.xorg/60-checknet index cafafac..2c61146 100755 --- a/ublinux/rc.xorg/60-checknet +++ b/ublinux/rc.xorg/60-checknet @@ -1,7 +1,7 @@ #!/bin/sh ENABLED=no -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 SOURCE=${SYSCONF}/config; [ -f "${SOURCE}" ] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/desktop; [ -f "${SOURCE}" ] && . ${SOURCE} 2>/dev/null @@ -13,7 +13,7 @@ STARTNWTOOL=/usr/share/ublinux/i3term/zenWIFI WM=marco TESTINDE=i3term -. /usr/lib/ublinux/os-config +. /usr/lib/ublinux/default [ -f /run/$(basename $0)_started ] && exit 0 diff --git a/ublinux/rc.xorg/90-secretnet b/ublinux/rc.xorg/90-secretnet index b04bc4d..da6a136 100755 --- a/ublinux/rc.xorg/90-secretnet +++ b/ublinux/rc.xorg/90-secretnet @@ -1,7 +1,7 @@ #!/bin/bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 SNLIBS=/opt/secretnet/lib diff --git a/ublinux/scripts/grub-functions b/ublinux/scripts/grub-functions index a024310..e46d706 100755 --- a/ublinux/scripts/grub-functions +++ b/ublinux/scripts/grub-functions @@ -1,7 +1,7 @@ #!/usr/bin/env bash ENABLED=yes -[ "$ENABLED" != "yes" ] && exit 0 +[[ ${ENABLED} == "yes" ]] || exit 0 SELF_NAME="grub-functions" diff --git a/ublinux/templates/ublinux-data.ini b/ublinux/templates/ublinux-data.ini index d2cd709..f2bc4ce 100644 --- a/ublinux/templates/ublinux-data.ini +++ b/ublinux/templates/ublinux-data.ini @@ -5,8 +5,8 @@ # If you are working in sandbox mode and you don't have the /ublinux-data/ # folder, you can move it to the /ublinux/ folder -# UBLinux settings -# UBLinux настройка +# UBLinux system settings +# UBLinux настройка системы ################################################################################ # How it works. @@ -25,6 +25,13 @@ # |строка # добавит строку в файл без проверки. # -expression # remove all string with expression (see info sed). symbols .* matches all strings in file. # -выражение # удаляет строки соответствующие выражению (см info sed). Если указать .* то будут удалены все строки. +################################################################################ + +################################################################################ +# Поддерживаемые команды Grub +# services_enable # Перечень сервисов/юнитов который должны быть запущены, разделитель (,) или (;). Пример: services_enable=sbm,nmb,cockpit.socket +# services_disable # Перечень сервисов/юнитов которые должны быть выключены, разделитель (,) или (;). Пример: services_disable=sbm,nmb,cockpit.socket +################################################################################ [/etc/ublinux/config] ################################################################################ @@ -36,22 +43,9 @@ VERSION= ## Дополнительные параметры загрузки, только для управления модулями #CMDLINE="noload=/12,/92 findswap" - -## Autostart services -## Автоматически запускать службы (можно указывать службы xinetd) -## Для работы bluetooth SERVICESSTART+=,bluetooth -## Для работы в WINDOWS сетях с DNS NETBIOS, включить NSSWITCHWINBIND=yes и добавить SERVICESSTART+=,nmb,winbind -## Для VMWareWorkstation: vmware-networks,vmware-usbarbitrator -## SERVICESSTART+=,tor,polipo,cups-lpd,pcscd -SERVICESSTART=dbus-broker,NetworkManager,sshd,systemd-swap,cups,cockpit.socket,avahi-daemon,avahi-dnsconfd,veyon,smb,nmb,winbind,bluetooth - -## You can disable some of standart services start -## Отключение служб, включенных по умолчанию -#SERVICESNOSTART=xinetd,pdnsd,iptables,wine - -## You can disable and mask some of standart service -## Отключение и блокировка служб, включенных по умолчанию -#SERVICESMASK=adb +[/etc/ublinux/system] +## Базовые настройки системы +################################################################################ HOSTNAME=ublinux-install @@ -66,87 +60,33 @@ HOSTNAME=ublinux-install #MACHINEID=hardware MACHINEID=hardware +## Включить сервисы/юниты (можно указывать службы inetd) +## SERVICES_ENABLE=, +## # Имя сервиса/юнита, если не указан тип, то используется '.service'. Пример: nmb +## Для работы bluetooth: SERVICEs_ENABLE++=bluetooth +## Для работы в WINDOWS сетях с DNS NETBIOS, включить NSSWITCHWINBIND=yes и добавить" SERVICES_ENABLE++=nmb,winbind +## Для VMWareWorkstation: SERVICES_ENABLE++=vmware-networks,vmware-usbarbitrator +## SERVICES_ENABLE++=tor,polipo,cups-lpd,pcscd +SERVICES_ENABLE=dbus-broker,NetworkManager,sshd,systemd-swap,cups,cockpit.socket,avahi-daemon,avahi-dnsconfd,veyon,smb,nmb,winbind,bluetooth + +## Отключить сервисы/юниты, включенных по умолчанию +## SERVICES_DISABLE=, +## # Имя сервиса/юнита, если не указан тип, то используется '.service'. Пример: nmb +#SERVICES_DISABLE=xinetd,pdnsd,iptables,wine + +## Заблокировать и отключить сервисы/юниты, включенных по умолчанию. Запретить запуск как зависимость +## SERVICES_MASK=, +## # Имя сервиса/юнита, если не указан тип, то используется '.service'. Пример: nmb +#SERVICES_MASK=adb + +## Разблокировать сервисы/юниты, выключенных по умолчанию. Разрешить запуск как зависимость +## SERVICES_UNMASK=, +## # Имя сервиса/юнита, если не указан тип, то используется '.service'. Пример: nmb +#SERVICES_UNMASK=adb + ## Включить Apparmor, по умолчанию отключен #APPARMOR=yes -## Mount local partitions -## Подключение всех разделов при старте -#PARTITIONSAUTOMOUNT=yes - -## Не подключать указанные разделы -#PARTITIONSNOMOUNT=boot,hidden - -## Пользователь - владелец для fat ntfs -#PARTITIONSMOUNTUID=500 - -## Автомонтирование папок -## Пароль кодировать в base64: echo 'password' | base64 -## AUTOMOUNT_SHARE[mountpoint]='cifs:share:username:password_base64:domain:opt' -## AUTOMOUNT_SHARE[/mnt/cifs:share]='cifs://192.168.103.55/share:user:password_base64:domain:noperm,vers=1.0' -## AUTOMOUNT_SHARE[/media/sdb1]='direct:/dev/sdb1:wheel:775:noacl' -## AUTOMOUNT_SHARE[/media/mytag]='virtiofs:mytag:wheel:775:' -## AUTOMOUNT_SHARE[/mnt/sshfs/user-1@192.168.1.1]='sshfs:superadmin@192.168.1.1:/home/user-1:password_base64:' -#AUTOMOUNT_SHARE[/mnt/share2]='cifs://192.168.103.55/share2:share:password_base64:domain:noperm,vers=1.0' -#AUTOMOUNT_SHARE[/media/sda4]='direct:/dev/sda4:wheel:775:noacl' -#AUTOMOUNT_SHARE[/mnt/sshfs/user-1@192.168.1.1]='sshfs:superadmin@192.168.1.1:/home/user-1:password_base64:' -#AUTOMOUNT_SHARE[/mnt/nfs/user-1@192.168.1.1]='nfs:192.168.1.1:/home/user-1' - -## Папка с правами 777 доступная всем локальным пользователям и при разрешении всем из сети -## по умолчанию PUBLICDIR=/home/public -#PUBLICDIR= - -## Mount shared media from ublinux-server automatically -## Подключаться к серверу при старте -#AUTOMOUNTSERVER=yes - -## Share local partitions via NFS-Server -## Разрешать общий доcтуп к разделам через NFS -#PARTITIONSSHARE=yes - -## Исключение для общих разделов -#PARTITIONSNOSHARE=archive,private - -## Настройка принтера -## PRINTERADD=manual (default) -#PRINTERADD=auto - -## Обновлять кеш библиотек при старте. Полезно при использовании модулей от старых сборок. -#RUNLDCONFIG=yes - -## Обновление базы данных модулей, если используются сторонние модули ядра или видео проприетарное -DEPMOD=yes - -## Обновлять домашний каталог при загрузке если он уже существует -#UPDATEHOME=yes - -## Можно отключить использование tmpfs для /tmp или /var/tmp при работе с профилем -#TMPFS=no -#VARTMPFS=no - -## Включение pulseaudio (yes, no) -#PULSEAUDIO=yes - -## Установить звуковое устройство по умолчанию для ALSA, к примеру для вывода звука через HDMI -## устройства смотрите в выводе aplay -l -#ALSACARD=1 -#ALSADEVICE=7 - -## Автообновление системы -## UBLINUXUPDATE= -## =auto # автоматически -## =ask # спросить у пользователя (по умолчанию) -## =never # не обновлять автоматически -#UBLINUXUPDATE=auto - -## Алгоритм сжатия модулей по умолчанию -#MKSQFS_OPTS="-b 512K -comp xz -Xbcj x86" - -## Алгоритм сжатия, используемый для сохранения изменений в модуль -#MKSQFS_FASTALG="-b 512K -comp lz4 -Xhc" - -[/etc/ublinux/system] -## Базовые настройки системы -################################################################################ ## Установить переменные окружения глобальные и пользовательские ## ENVIROMENT[system:]= ## ENVIROMENT[profile:]= @@ -178,6 +118,37 @@ DEPMOD=yes #AUTHPAM[sssd]=with-faillock,with-time,with-systemd-homed,with-mkhomedir-simple #AUTHPAM=disable +## Алгоритм сжатия модулей по умолчанию +#MKSQFS_OPTS="-b 512K -comp xz -Xbcj x86" + +## Алгоритм сжатия, используемый для сохранения изменений в модуль +#MKSQFS_FASTALG="-b 512K -comp lz4 -Xhc" + +[/etc/ublinux/hardware] +## Базовые настройки аппаратного обеспечения +################################################################################ +## Настройка принтера +## PRINTERADD=*manual|auto +## *manual # Вручную управлять добавление принтеров +## auto # Пытаться автоматически определить и добавить принтер, в том числе Canon CAPT +#PRINTERADD=auto + +## Обновлять кеш библиотек при старте. Полезно при использовании модулей от старых сборок. +## RUNLDCONFIG=*yes|y|no|n +#RUNLDCONFIG=yes + +## Обновление базы данных модулей, если используются сторонние модули ядра или видео проприетарное +## DEPMOD=*yes|y|no|n +#DEPMOD=yes + +## Включение pulseaudio (yes, no) +#PULSEAUDIO=yes + +## Установить звуковое устройство по умолчанию для ALSA, к примеру для вывода звука через HDMI +## устройства смотрите в выводе aplay -l +#ALSACARD=1 +#ALSADEVICE=7 + [/etc/ublinux/users] ## Базовые настройки пользователей и групп ################################################################################ @@ -185,22 +156,22 @@ DEPMOD=yes ## Что-бы получить хэш "openssl passwd -6 " | "mkpasswd2 -m sha256crypt " | "mkpasswd2 -m help" ## Хэш пароля для пользователя по умолчанию (стандартно ublinux) -## Если пароль стандартный, то будет подсказка на фоне рабочего стола + /etc/ublinux/firstboot (Первый запуск для настройки системы) -DEFAULTPASSWD='$6$E7stRhRS8fCKk7UU$Qoqw62AUaUa5uLIc2KC7WV3MUThhrR8kjXtCODmnKCzKe2zHu1/wmsiWBHZEIk/IQnk/aELQYbUK93OUtrwg60' +## Если пароль стандартный, то включен первый запуск для настройки системы. Отображение подсказки на фоне рабочего стола и "[config] firstboot=yes" +#DEFAULTPASSWD='$6$E7stRhRS8fCKk7UU$Qoqw62AUaUa5uLIc2KC7WV3MUThhrR8kjXtCODmnKCzKe2zHu1/wmsiWBHZEIk/IQnk/aELQYbUK93OUtrwg60' ## Default root password is 'ublinux' ## Хеш пароля для пользователя root (стандартно ublinux) -DEFAULTROOTPASSWD='$6$E7stRhRS8fCKk7UU$Qoqw62AUaUa5uLIc2KC7WV3MUThhrR8kjXtCODmnKCzKe2zHu1/wmsiWBHZEIk/IQnk/aELQYbUK93OUtrwg60' +#DEFAULTROOTPASSWD='$6$E7stRhRS8fCKk7UU$Qoqw62AUaUa5uLIc2KC7WV3MUThhrR8kjXtCODmnKCzKe2zHu1/wmsiWBHZEIk/IQnk/aELQYbUK93OUtrwg60' ## Default user name is 'superadmin' ## Имя пользователя по умолчанию, будет добавлен в группу whell, при условии если переменная NEEDEDUSERS пустая (стандартно superadmin) -DEFAULTUSER=superadmin +#DEFAULTUSER=superadmin ## Default hash algoritm for user password ## Алгоритм хеширования паролей, возможные значения: des, md5, yescrypt, gost-yescrypt, scrypt, bf, bcrypt, sha512crypt, sha256crypt, md5crypt, descrypt -## Алгоритмы ГОСТ: yescrypt, gost-yescrypt +## Алгоритмы GOST R 34.11-2012 (Streebog): gost-yescrypt ## Отключены: sunmd5, bcrypt-a, bsdicrypt, nt -#HASHPASSWD=sha512crypt +#HASHPASSWD=yescrypt ## You can cpecify users there whithout using "user=" boot parameter ## Пользователи системы (аналог параметра users) @@ -213,7 +184,8 @@ NEEDEDUSERS='superadmin:1000:x:Администратор' ## gecos # Поле GECOS, с подробным описанием пользователя, можно локализованное, не обязательное ## uid # UID пользователя, если необходимо автоматически рассчитывать, то оставить пустым или 'x' ## user_group # Основная группа пользователя, если выбрано пусто или 'x', то 'user_group=user_name' -## extra_groups # Дополнительные группы пользователя, если группа не существует, то будет создана. Перечисление через зяпятую. Если группа отсутствует, то будет создана новая. +## extra_groups # Дополнительные группы пользователя. Дополнительные к USERGROUPS +## # Если группа отсутствует или 'x', то 'extra_groups=users'. Если группа не существует, то будет создана. Перечисление через запятую. ## optional # Дополнительные параметры, например: '--shell /usr/bin/bash --create-home --no-create-home --no-user-group --non-unique' ## --home-dir <ДОМ_КАТ> # Домашний каталог новой учётной записи ## -s, --shell /usr/bin/bash # Регистрационная оболочка новой учётной записи @@ -225,7 +197,7 @@ NEEDEDUSERS='superadmin:1000:x:Администратор' ## password_hash|x # Хеш пароля пользователя, если выбрано 'x', то 'password_hash=${DEFAULTPASSWD}' ## # Если первые символы (!*) то аутентификация запрещена ## # Если первый символ (*) или (!), то аутентификация по паролю заблокирована. Но другие методы входа, такие как аутентификация на основе ключей или переключение на пользователя, по-прежнему разрешены -## USERADD[superadmin]=Администратор:1000:x:wheel +## USERADD[superadmin]='Администратор:1000:x:x:x:$6$E7stRhRS8fCKk7UU$Qoqw62AUaUa5uLIc2KC7WV3MUThhrR8kjXtCODmnKCzKe2zHu1/wmsiWBHZEIk/IQnk/aELQYbUK93OUtrwg60' ## USERADD[user-1]=x ## USERADD[user-1]='Пользователь-1:x:x:vboxusers,libvirt:-s /usr/bin/bash -o:$6$E7stRhRS8fCKk7UU$Qoqw62AUaUa5uLIc2KC7WV3MUThhrR8kjXtCODmnKCzKe2zHu1/wmsiWBHZEIk/IQnk/aELQYbUK93OUtrwg60' @@ -238,12 +210,12 @@ NEEDEDUSERS='superadmin:1000:x:Администратор' ## Параметры пользователя системы /etc/shadow. Если пользователь существует, то без изменений ## USERSHADOW[user_name]='lastchanged:minday:maxday:warn:inactive:expire' ## user_name # Имя пользователя, обязательное поле -## lastchanged # Дата последнего изменения пароля. Указывается, количество дней исчисляется с 1 января 1970 года (дата эпохи) +## lastchanged # Дата последнего изменения пароля. Указывается количество дней, исчисляется с 1 января 1970 года (дата эпохи) ## minday # Минимальное количество дней действия пароля, прежде чем пароль пользователя может быть изменен. По умолчанию 0 означает отсутствие минимального срока действия пароля ## maxday # Максимальное количество дней действия пароля после смены пароля пользователя. По умолчанию этот номер установлен на 99999 ## warn # Количество дней предупреждения, в течение которого пользователь получает предупреждение о необходимости изменения пароля ## inactive # Количество дней не активности пароля до отключения учетной записи пользователя. По умолчанию пустое -## expire # Срок хранения. Дата, когда учетная запись была отключена. Указывается, количество дней исчисляется с 1 января 1970 года (дата эпохи) +## expire # Дата, когда учетная запись была отключена. Указывается количество дней, исчисляется с 1 января 1970 года (дата эпохи) ## # Если один из параметров не задан, содержит пустое значение, то исходное значение не изменяется ## USERSHADOW[superadmin]=19695:0:99999:7::: ## USERSHADOW[superadmin]=18009:0:120:7:14:: @@ -257,7 +229,7 @@ NEEDEDUSERS='superadmin:1000:x:Администратор' ## Группы системы ## GROUPADD[group_name]='group_users:gid:optional:password_hash|x' ## group_name # Имя группы -## group_users # Пользователи группы, перечисление через зпятую. Может быть пусто. +## group_users # Пользователи группы, перечисление через запятую. Может быть пусто. ## gid # GID группы, если необходимо автоматически рассчитывать, то оставить пустым или 'x' ## optional # Дополнительные параметры, например: '--system --non-unique' ## -o, --non-unique # Разрешить создание групп с повторяющимися (не уникальными) GID @@ -270,10 +242,68 @@ NEEDEDUSERS='superadmin:1000:x:Администратор' ## Дополнительные группы, для всех пользователей, по умолчанию: scanner,power,audio,lp,optical,storage,video,sambashare,vboxusers,libvirt #USERGROUPS=scanner,power,audio,lp,optical,storage,video,sambashare,vboxusers,libvirt +## Обновлять домашний каталог при загрузке если он уже существует +## UPDATEHOME=*no|n|disable|yes|y|enable| +#UPDATEHOME=yes + ## Добавить пользователя с ID 1000 в группу Администраторов 'whell' ## ADDADM=*yes|no -## * =yes # Добавить пользователя ID 1000 в группу 'wheel' -## =no # Не выполнять действие +## *yes # Добавить пользователя ID 1000 в группу 'wheel' +## no # Не выполнять действие + +[/etc/ublinux/update] +## Настройка обновления системы +################################################################################ +## Автообновление системы +## UBLINUXUPDATE= +## =auto # автоматически +## =ask # спросить у пользователя (по умолчанию) +## =never # не обновлять автоматически +#UBLINUXUPDATE=auto + +[/etc/ublinux/mount] +## Настройка подключения сетевых ресурсов +################################################################################ +## Папка с правами 777 доступная всем локальным пользователям и при разрешении всем из сети +## по умолчанию PUBLICDIR=/home/public +#PUBLICDIR= + +## Автомонтирование сетевых ресурсов +## Пароль кодировать в base64: echo 'password' | base64 +## AUTOMOUNT_SHARE[mountpoint]='cifs:share:username:password_base64:domain:opt' +## AUTOMOUNT_SHARE[/mnt/cifs:share]='cifs://192.168.103.55/share:user:password_base64:domain:noperm,vers=1.0' +## AUTOMOUNT_SHARE[/media/sdb1]='direct:/dev/sdb1:wheel:775:noacl' +## AUTOMOUNT_SHARE[/media/mytag]='virtiofs:mytag:wheel:775:' +## AUTOMOUNT_SHARE[/mnt/sshfs/user-1@192.168.1.1]='sshfs:superadmin@192.168.1.1:/home/user-1:password_base64:' +#AUTOMOUNT_SHARE[/mnt/share2]='cifs://192.168.103.55/share2:share:password_base64:domain:noperm,vers=1.0' +#AUTOMOUNT_SHARE[/media/sda4]='direct:/dev/sda4:wheel:775:noacl' +#AUTOMOUNT_SHARE[/mnt/sshfs/user-1@192.168.1.1]='sshfs:superadmin@192.168.1.1:/home/user-1:password_base64:' +#AUTOMOUNT_SHARE[/mnt/nfs/user-1@192.168.1.1]='nfs:192.168.1.1:/home/user-1' + +## Mount local partitions +## Подключение всех разделов при старте +#PARTITIONSAUTOMOUNT=yes + +## Не подключать указанные разделы +#PARTITIONSNOMOUNT=boot,hidden + +## Пользователь - владелец для fat ntfs +#PARTITIONSMOUNTUID=500 + +## Mount shared media from ublinux-server automatically +## Подключаться к серверу при старте +#AUTOMOUNTSERVER=yes + +## Share local partitions via NFS-Server +## Разрешать общий доcтуп к разделам через NFS +#PARTITIONSSHARE=yes + +## Исключение для общих разделов +#PARTITIONSNOSHARE=archive,private + +## Отключить использование tmpfs для /tmp или /var/tmp при работе с профилем +#TMPFS=no +#VARTMPFS=no [/etc/ublinux/logging] ## Настройка аудита и логгирования @@ -614,8 +644,12 @@ IPV6=no ## не задано # Не настраивать автоматически NTPSERVERS=dhcp -## Добавить порядок поиска DNS: avahi и winbind (default no) +## Добавить в порядок поиска DNS: avahi +## NSSWITCHAVAHI=*no|n|yes|y NSSWITCHAVAHI=yes + +## Добавить в порядок поиска DNS: winbind +## NSSWITCHWINBIND=*no|n|yes|y NSSWITCHWINBIND=yes ## Установка системных прокси для HTTP,HTTPS,FTP,SOCKS,RSYNC и адреса исключений EXCLUDE