Fix qemu guest

master
Dmitry Razumov 2 years ago
parent 1abdb83a10
commit b0d3098b9f
Signed by: asmeron
GPG Key ID: 50BC1DB583B79706

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
#SMBOPTSDEF="vers=3,nolock,users,noauto" #SMBOPTSDEF="vers=3,nolock,users,noauto"
@ -18,7 +18,8 @@ SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
if [[ -n "${AUTOMOUNT_SHARE[@]}" ]]; then if [[ -n "${AUTOMOUNT_SHARE[@]}" ]]; then
for SHARE in "${!AUTOMOUNT_SHARE[@]}"; do for SHARE in "${!AUTOMOUNT_SHARE[@]}"; do
if [[ "$(cut -d: -f1 <<< ${AUTOMOUNT_SHARE[${SHARE}]})" == "direct" ]]; then MOUNT_MODE=$(cut -d: -f1 <<< ${AUTOMOUNT_SHARE[${SHARE}]})
if [[ ${MOUNT_MODE} == "direct" ]]; then
PATH_MOUNT_FROM="$(cut -d: -f2 <<< ${AUTOMOUNT_SHARE[${SHARE}]})" PATH_MOUNT_FROM="$(cut -d: -f2 <<< ${AUTOMOUNT_SHARE[${SHARE}]})"
[[ -d ${SHARE} ]] && umount -qRlf "${SHARE}" || mkdir -p "${SHARE}" [[ -d ${SHARE} ]] && umount -qRlf "${SHARE}" || mkdir -p "${SHARE}"
GROUP="$(cut -d: -f3 <<< ${AUTOMOUNT_SHARE[${SHARE}]})" GROUP="$(cut -d: -f3 <<< ${AUTOMOUNT_SHARE[${SHARE}]})"
@ -29,6 +30,17 @@ SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null
[[ -z ${OPTS} ]] && OPTS="${OPTSDEF}" [[ -z ${OPTS} ]] && OPTS="${OPTSDEF}"
[[ -n ${OPTS} ]] && OPTS=" -o ${OPTS}" [[ -n ${OPTS} ]] && OPTS=" -o ${OPTS}"
mount ${PATH_MOUNT_FROM} ${SHARE} ${OPTS} mount ${PATH_MOUNT_FROM} ${SHARE} ${OPTS}
elif [[ ${MOUNT_MODE} == "virtiofs" ]]; then
PATH_MOUNT_TAG="$(cut -d: -f2 <<< ${AUTOMOUNT_SHARE[${SHARE}]})"
[[ -d ${SHARE} ]] && umount -qRlf "${SHARE}" || mkdir -p "${SHARE}"
GROUP="$(cut -d: -f3 <<< ${AUTOMOUNT_SHARE[${SHARE}]})"
[[ -n ${GROUP} ]] && chown -f root:${GROUP} ${SHARE}
MOD="$(cut -d: -f4 <<< ${AUTOMOUNT_SHARE[${SHARE}]})"
[[ -n ${MOD} ]] && chmod -f ${MOD} "${SHARE}"
OPTS="$(cut -d: -f5 <<< ${AUTOMOUNT_SHARE[${SHARE}]})"
[[ -z ${OPTS} ]] && OPTS="${OPTSDEF}"
[[ -n ${OPTS} ]] && OPTS=" -o ${OPTS}"
mount -t virtiofs ${PATH_MOUNT_TAG} ${SHARE} ${OPTS}
fi fi
done done
fi fi

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[[ ${ENABLED} != "yes" ]] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

@ -6,12 +6,13 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
DEBUGMODE=no
. usr/lib/ublinux/functions . usr/lib/ublinux/functions
. usr/lib/ublinux/os-config . usr/lib/ublinux/os-config
debug_mode "$0" "$@" debug_mode "$0" "$@"
MODULESPRELOAD="" MODULESPRELOAD=""

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

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

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
SELF_NAME="10-system" SELF_NAME="10-system"

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=no ENABLED=no
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
DEBUGMODE=no DEBUGMODE=no

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
DEBUGMODE=no DEBUGMODE=no

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[[ ${ENABLED} != yes ]] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

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

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[[ ${ENABLED} != "yes" ]] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[[ ${ENABLED} != "yes" ]] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin

@ -6,17 +6,19 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
. usr/lib/ublinux/functions
. usr/lib/ublinux/os-config 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
debug_mode "$0" "$@" debug_mode "$0" "$@"
if grep -qi virtualbox /sys/devices/virtual/dmi/id/*name; then if grep -qi virtualbox /sys/devices/virtual/dmi/id/*name; then
echo -e vboxguest\\nvboxsf\\nvboxvideo > usr/lib/modules-load.d/vbox-guest-additions.conf echo -e vboxguest\\nvboxsf\\nvboxvideo > ${ROOTFS}/usr/lib/modules-load.d/vbox-guest-additions.conf
[ -f usr/lib/systemd/system/vboxservice.service ] && ln -sf /usr/lib/systemd/system/vboxservice.service etc/systemd/system/multi-user.target.wants/vboxservice.service [[ -f ${ROOTFS}/usr/lib/systemd/system/vboxservice.service ]] && ln -sf /usr/lib/systemd/system/vboxservice.service ${ROOTFS}/etc/systemd/system/multi-user.target.wants/vboxservice.service
else else
rm -f usr/lib/modules-load.d/vbox-guest-additions.conf etc/systemd/system/multi-user.target.wants/vboxservice.service rm -f ${ROOTFS}/usr/lib/modules-load.d/vbox-guest-additions.conf ${ROOTFS}/etc/systemd/system/multi-user.target.wants/vboxservice.service
fi fi

@ -6,18 +6,20 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
. usr/lib/ublinux/functions
. usr/lib/ublinux/os-config 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
debug_mode "$0" "$@" debug_mode "$0" "$@"
if grep -qi vmware /sys/devices/virtual/dmi/id/*name; then if grep -qi vmware /sys/devices/virtual/dmi/id/*name; then
[ -f usr/lib/systemd/system/vmtoolsd.service ] && ln -sf /usr/lib/systemd/system/vmtoolsd.service etc/systemd/system/multi-user.target.wants/vmtoolsd.service [[ -f ${ROOTFS}/usr/lib/systemd/system/vmtoolsd.service ]] && ln -sf /usr/lib/systemd/system/vmtoolsd.service ${ROOTFS}/etc/systemd/system/multi-user.target.wants/vmtoolsd.service
[ -f usr/lib/systemd/system/vmware-vmblock-fuse.service ] && ln -sf /usr/lib/systemd/system/vmtoolsd.service etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service [[ -f ${ROOTFS}/usr/lib/systemd/system/vmware-vmblock-fuse.service ]] && ln -sf /usr/lib/systemd/system/vmtoolsd.service ${ROOTFS}/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service
else else
rm -f etc/systemd/system/multi-user.target.wants/vmtoolsd.service rm -f ${ROOTFS}/etc/systemd/system/multi-user.target.wants/vmtoolsd.service
rm -f etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service rm -f ${ROOTFS}/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service
fi fi

@ -6,12 +6,14 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
. usr/lib/ublinux/functions
. usr/lib/ublinux/os-config 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
debug_mode "$0" "$@" debug_mode "$0" "$@"
if grep -qi Microsoft /sys/devices/virtual/dmi/id/*vendor; then if grep -qi Microsoft /sys/devices/virtual/dmi/id/*vendor; then

@ -16,8 +16,16 @@ SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
debug_mode "$0" "$@" debug_mode "$0" "$@"
if grep -qi qemu /sys/devices/virtual/dmi/id/*vendor; then # if grep -qi qemu /sys/devices/virtual/dmi/id/*vendor; then
[[ -f usr/lib/systemd/system/qemu-guest-agent.service ]] && ln -sf /usr/lib/systemd/system/qemu-guest-agent.service etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service # [[ -f usr/lib/systemd/system/qemu-guest-agent.service ]] && ln -sf /usr/lib/systemd/system/qemu-guest-agent.service etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service
else # else
rm -f etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service # rm -f etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service
# fi
# Применимо для версии пакета qemu < 8.0.0
FILE_UDEV_RULES_QUEMU_GUEST="99-qemu-guest-agent.rules"
if [[ ! -f ${ROOTFS}/usr/lib/udev/rules.d/${FILE_UDEV_RULES_QUEMU_GUEST} ]]; then
cat <<EOF > "${ROOTFS}/usr/lib/udev/rules.d/${FILE_UDEV_RULES_QUEMU_GUEST}"
SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", TAG+="systemd" ENV{SYSTEMD_WANTS}="qemu-guest-agent.service"
EOF
fi fi

@ -6,12 +6,12 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
unset ROOTFS; [[ -d /usr/lib/ublinux ]] || ROOTFS=. [[ -d /usr/lib/ublinux ]] && { unset ROOTFS; unset CMD_CHROOT; } || { ROOTFS='.'; CMD_CHROOT='chroot . '; }
SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0 SOURCE=${ROOTFS}/usr/lib/ublinux/os-config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
debug_mode "$0" "$@" debug_mode "$0" "$@"
@ -25,10 +25,10 @@ SERVICEAPPARMOR="apparmor.service"
mkdir -p proc mkdir -p proc
mount -o rbind /proc proc mount -o rbind /proc proc
if readlink -fq ${ROOTFS}/usr/bin/init | grep -q "lib/systemd/systemd$"; then if readlink -fq ${ROOTFS}/usr/bin/init | grep -q "lib/systemd/systemd$"; then
chroot . systemctl unmask ${SERVICEAPPARMOR} ${CMD_CHROOT} ${ROOTFS}/usr/bin/systemctl unmask ${SERVICEAPPARMOR}
chroot . systemctl enable ${SERVICEAPPARMOR} || chroot . chkconfig --add ${SERVICEAPPARMOR} ${CMD_CHROOT} ${ROOTFS}/usr/bin/systemctl enable ${SERVICEAPPARMOR} || ${CMD_CHROOT} ${ROOTFS}/usr/bin/chkconfig --add ${SERVICEAPPARMOR}
else else
chroot . chkconfig --add ${SERVICEAPPARMOR} ${CMD_CHROOT} ${ROOTFS}/usr/bin/chkconfig --add ${SERVICEAPPARMOR}
fi fi
umount proc umount proc

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no DEBUGMODE=no
#PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin #PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
@ -22,18 +22,18 @@ SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
if [ "$(cmdline_parameter ub.osinstall)" ]; then if [ "$(cmdline_parameter ub.osinstall)" ]; then
TTY_N=2 TTY_N=2
EXEC_START="/usr/bin/ubinstall.cli" EXEC_START="/usr/bin/ubinstall.cli"
sed -i "s/.*NAutoVTs=6.*/NAutoVTs=0/" etc/systemd/logind.conf sed -i "s/.*NAutoVTs=6.*/NAutoVTs=0/" ${ROOTFS}/etc/systemd/logind.conf
sed -i "s/.*ReserveVT=6.*/ReserveVT=0/" etc/systemd/logind.conf sed -i "s/.*ReserveVT=6.*/ReserveVT=0/" ${ROOTFS}/etc/systemd/logind.conf
mkdir -p etc/systemd/system/getty@tty${TTY_N}.service.d mkdir -p ${ROOTFS}/etc/systemd/system/getty@tty${TTY_N}.service.d
echo "[Service]" > etc/systemd/system/getty@tty${TTY_N}.service.d/override.conf echo "[Service]" > ${ROOTFS}/etc/systemd/system/getty@tty${TTY_N}.service.d/override.conf
echo "ExecStart=" >> etc/systemd/system/getty@tty${TTY_N}.service.d/override.conf echo "ExecStart=" >> ${ROOTFS}/etc/systemd/system/getty@tty${TTY_N}.service.d/override.conf
FONT=$(grep "FONT" etc/vconsole.conf | cut -d= -f2) FONT=$(grep "FONT" ${ROOTFS}/etc/vconsole.conf | cut -d= -f2)
[[ -z ${FONT} ]] && FONT=${CONSOLE_FONT:-cyr-sun16} [[ -z ${FONT} ]] && FONT=${CONSOLE_FONT:-cyr-sun16}
echo "ExecStart=-bash -c \". /etc/locale.conf; export LANG; setfont ${FONT}; ${EXEC_START}\"" >> etc/systemd/system/getty@tty${TTY_N}.service.d/override.conf echo "ExecStart=-bash -c \". /etc/locale.conf; export LANG; setfont ${FONT}; ${EXEC_START}\"" >> ${ROOTFS}/etc/systemd/system/getty@tty${TTY_N}.service.d/override.conf
echo "StandardInput=tty" >> etc/systemd/system/getty@tty${TTY_N}.service.d/override.conf echo "StandardInput=tty" >> ${ROOTFS}/etc/systemd/system/getty@tty${TTY_N}.service.d/override.conf
echo "StandardOutput=tty" >> etc/systemd/system/getty@tty${TTY_N}.service.d/override.conf echo "StandardOutput=tty" >> ${ROOTFS}/etc/systemd/system/getty@tty${TTY_N}.service.d/override.conf
mkdir -p etc/systemd/system/getty.target.wants mkdir -p ${ROOTFS}/etc/systemd/system/getty.target.wants
ln -sf /usr/lib/systemd/system/getty@.service etc/systemd/system/getty.target.wants/getty@tty${TTY_N}.service ln -sf /usr/lib/systemd/system/getty@.service ${ROOTFS}/etc/systemd/system/getty.target.wants/getty@tty${TTY_N}.service
ln -sf /dev/null etc/systemd/system/getty.target.wants/getty@tty1.service ln -sf /dev/null ${ROOTFS}/etc/systemd/system/getty.target.wants/getty@tty1.service
fi fi

@ -6,10 +6,11 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
DEBUGMODE=no
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
DEBUGMODE=no
INIGZFILE=$(find /memory -maxdepth 1 -iname "*.ini.gz") INIGZFILE=$(find /memory -maxdepth 1 -iname "*.ini.gz")
. usr/lib/ublinux/functions . usr/lib/ublinux/functions
. usr/lib/ublinux/os-config . usr/lib/ublinux/os-config
@ -19,7 +20,8 @@ debug_mode "$0" "$@"
[ -f $INIGZFILE ] || echo "Config file '*.ini.gz' not found!" [ -f $INIGZFILE ] || echo "Config file '*.ini.gz' not found!"
grep -q ^/ <<< "${SYSCONF}" && SYSCONF=.${SYSCONF} grep -q ^/ <<< "${SYSCONF}" && SYSCONF=.${SYSCONF}
mkdir -p "${SYSCONF}" [[ -d ${SYSCONF} ]] || mkdir -p "${SYSCONF}"
rm -rdf ${SYSCONF}/{..?*,.[!.]*,*} 2>/dev/null
# ublinux.ini processing # ublinux.ini processing
FNAME="${SYSCONF}/config" FNAME="${SYSCONF}/config"

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
DEBUGMODE=no DEBUGMODE=no

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
DEBUGMODE=no DEBUGMODE=no

@ -6,7 +6,7 @@
# All system path must be relative, except initrd dirs # All system path must be relative, except initrd dirs
ENABLED=yes ENABLED=yes
[ "$ENABLED" != "yes" ] && exit 0 [[ ${ENABLED} == "yes" ]] || exit 0
PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
DEBUGMODE=no DEBUGMODE=no

@ -126,11 +126,12 @@ MACHINEID=hardware
## Пользователь - владелец для fat ntfs ## Пользователь - владелец для fat ntfs
#PARTITIONSMOUNTUID=500 #PARTITIONSMOUNTUID=500
## Автомонтирование папок, внимание на порядковый номер после имени переменной ## Автомонтирование папок
## Пароль кодировать в base64: echo 'password' | base64 ## Пароль кодировать в base64: echo 'password' | base64
## AUTOMOUNT_SHARE[mountpoint]='cifs:share:username:password_base64:domain:opt' ## 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[/mnt/cifs:share]='cifs://192.168.103.55/share:user:password_base64:domain:noperm,vers=1.0'
## AUTOMOUNT_SHARE[/mnt/sdb1]='direct:/dev/sdb1:wheel:775:noacl' ## AUTOMOUNT_SHARE[/mnt/sdb1]='direct:/dev/sdb1:wheel:775:noacl'
## AUTOMOUNT_SHARE[/mnt/sdb1]='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/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[/mnt/share2]='cifs://192.168.103.55/share2:share:password_base64:domain:noperm,vers=1.0'
#AUTOMOUNT_SHARE[/mnt/sda4]='direct:/dev/sda4:wheel:775:noacl' #AUTOMOUNT_SHARE[/mnt/sda4]='direct:/dev/sda4:wheel:775:noacl'
@ -613,6 +614,7 @@ NSSWITCHWINBIND=yes
## CGROUP_QUOTA[user-1000.slice]="MemoryHigh=200M,MemorySwapMax=300M,CPUQuota=100%" ## CGROUP_QUOTA[user-1000.slice]="MemoryHigh=200M,MemorySwapMax=300M,CPUQuota=100%"
## CGROUP_QUOTA[superadmin]="MemoryHigh=500M,MemorySwapMax=100M,CPUQuota=400%" ## CGROUP_QUOTA[superadmin]="MemoryHigh=500M,MemorySwapMax=100M,CPUQuota=400%"
## CGROUP_QUOTA[smb.service]="MemoryHigh=100M,MemorySwapMax=0M,CPUQuota=100%" ## CGROUP_QUOTA[smb.service]="MemoryHigh=100M,MemorySwapMax=0M,CPUQuota=100%"
## CGROUP_QUOTA[superadmin]="MemoryHigh=1G,MemoryMax=7G,MemorySwapMax=64M,CPUQuota=395%,IOReadBandwidthMax=/dev/sda3 1M,IOWriteBandwidthMax=/dev/sdb3 2M,IOReadBandwidthMax=/dev/sdc3 16K,IOWriteBandwidthMax=/dev/sdd3 16K"
## Управление разрешениями действий polkit, можно разрешать для группы пользователей ## Управление разрешениями действий polkit, можно разрешать для группы пользователей
## POLKIT[id_object]=result:group_1,group_n" ## POLKIT[id_object]=result:group_1,group_n"

Loading…
Cancel
Save