Merge tag 'v1.6.1' into sisyphus
v1.6.1 - services: add targets for enable/disable bluetooth - services: create lists of services to disable/enable in Live with installer - live-install: add base packages for install and live - xdg-user-dirs: add missing use/services for enable systemd service - live-install: fix list of base packages for installed system - control: create list of control to set in Live with installer - install2: create postinstall.d/86-all-groups if not exist only - replace image-scripts.d/30-all-groups from build-distro to common rootfs - repo: run 90-repo-mirror for Live also - live-install: fix use/live/repo to be compatible with 90-repo-mirror - pkg.in/lists: mark interactivesystem as metapackage - stage2: enable bootchain for e2k arch and p11, c11* branches - add latests commits for ALT Server
This commit is contained in:
Anton Midyukov
commit
59de2a25f0
@ -12,7 +12,7 @@ endif
|
||||
|
||||
ifeq (,$(filter-out i586 x86_64 ppc64le aarch64 e2k%,$(ARCH)))
|
||||
distro/alt-server: server_groups_desktop = $(addprefix centaurus/,\
|
||||
80-desktop emulators freenx-server mate office pidgin vlc xorg scanning samba)
|
||||
80-desktop emulators freenx-server mate office pidgin xorg scanning samba)
|
||||
endif
|
||||
|
||||
ifeq (,$(filter-out x86_64,$(ARCH)))
|
||||
@ -53,7 +53,6 @@ endif
|
||||
@$(call add,INSTALL2_BRANDING,notes)
|
||||
@$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power)
|
||||
@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
|
||||
@$(call add,STAGE2_BOOTARGS,lang=ru_RU)
|
||||
ifeq (,$(filter-out e2k,$(ARCH)))
|
||||
@$(call set,META_APP_ID,ALT Server for Elbrus-4.4)
|
||||
endif
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
mixin/alt-server: server_groups = $(addprefix centaurus/,\
|
||||
10-alterator 20-server-apps 50-freeipa 70-dev 901-net-if-mgt \
|
||||
10-alterator 20-server-apps 50-freeipa 70-dev 801-grp-pol 901-net-if-mgt \
|
||||
sambaDC buildsystem dhcp-server-a diag-tools dns-server-a ftp-server-a \
|
||||
mail-server-a owncloud freeipa-client nm-daemon \
|
||||
systemd-networkd openuds openuds-tunnel admc)
|
||||
systemd-networkd openuds openuds-tunnel admc gpupdate gptemplates)
|
||||
|
||||
mixin/alt-server: server_main_kmodules = bcmwl ch34x dm-secdel drbd9 drm-ancient \
|
||||
drm-nouveau drm e1000e hifc hinic i40e ide ipset ipt_netflow ipt-ratelimit \
|
||||
@ -34,7 +34,8 @@ ifeq (,$(filter-out i586 x86_64,$(ARCH)))
|
||||
endif
|
||||
@$(call add,THE_BRANDING,alterator)
|
||||
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
|
||||
@$(call set,KFLAVOURS,std-def)
|
||||
@$(call set,KFLAVOURS,std-def un-def)
|
||||
@$(call add,INSTALL2_PACKAGES,installer-feature-cleanup-kernel-stage3)
|
||||
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
|
||||
@$(call add,BASE_KMODULES,drm)
|
||||
@$(call add,MAIN_GROUPS,centaurus/proxmox-backup-server)
|
||||
|
||||
@ -16,7 +16,8 @@ endif
|
||||
mixin/mobile-base: use/ntp/chrony use/repo use/branding/notes use/x11-autostart \
|
||||
use/deflogin/privileges use/deflogin/xgrp use/deflogin/hardware \
|
||||
use/deflogin/root use/l10n/ru_RU use/xdg-user-dirs \
|
||||
use/drm use/firmware mixin/ttyescape +plymouth +pipewire
|
||||
use/drm use/firmware mixin/ttyescape +plymouth +pipewire \
|
||||
use/services/bluetooth-enable
|
||||
@$(call add,THE_BRANDING,notes indexhtml)
|
||||
@$(call add,THE_LISTS,mobile/base)
|
||||
@$(call add,THE_PACKAGES,polkit-rule-mobile)
|
||||
@ -33,7 +34,6 @@ mixin/mobile-base: use/ntp/chrony use/repo use/branding/notes use/x11-autostart
|
||||
mixin/phosh: use/services +nm-gtk4 +nm-native
|
||||
@$(call add,THE_LISTS,mobile/phosh)
|
||||
@$(call add,DEFAULT_SERVICES_ENABLE,phosh)
|
||||
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
|
||||
@$(call set,DEFAULT_SESSION,phosh)
|
||||
|
||||
ifeq (vm,$(IMAGE_CLASS))
|
||||
|
||||
@ -31,10 +31,10 @@ mixin/regular-vm-x11:: mixin/regular-vm-base mixin/regular-x11 \
|
||||
mixin/regular-desktop use/oem/vnc; @:
|
||||
|
||||
vm/.regular-desktop: vm/systemd mixin/regular-vm-x11 \
|
||||
+systemd +systemd-optimal +plymouth
|
||||
+systemd +systemd-optimal +plymouth \
|
||||
use/services/bluetooth-enable
|
||||
@$(call add,THE_PACKAGES,bluez)
|
||||
@$(call add,THE_PACKAGES,glmark2 glmark2-es2)
|
||||
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
|
||||
@$(call try,VM_SIZE,8589934592)
|
||||
|
||||
vm/.regular-desktop-sysv: vm/bare mixin/regular-vm-x11 use/x11/gdm2.20 \
|
||||
|
||||
@ -69,9 +69,8 @@ endif
|
||||
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
|
||||
distro/.regular-desktop: distro/.regular-wm use/branding/full \
|
||||
use/firmware/laptop +systemd +systemd-optimal +vmguest \
|
||||
use/live-install/oem
|
||||
use/live-install/oem use/services/bluetooth-enable
|
||||
@$(call add,THE_PACKAGES,bluez)
|
||||
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
|
||||
|
||||
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
|
||||
|
||||
|
||||
@ -3,6 +3,9 @@
|
||||
|
||||
SCRIPT="/usr/share/install2/postinstall.d/86-all-groups"
|
||||
|
||||
# the script will be packaged into the installer-common-stage2
|
||||
[ ! -x "$SCRIPT" ] || exit 0
|
||||
|
||||
cat > "$SCRIPT" << EOF
|
||||
#!/bin/sh -efu
|
||||
|
||||
|
||||
6
features.in/control/live/image-scripts.d/51-control-install
Executable file
6
features.in/control/live/image-scripts.d/51-control-install
Executable file
@ -0,0 +1,6 @@
|
||||
#!/bin/sh
|
||||
# setup control(8) states for the installed system
|
||||
|
||||
[ -z "$GLOBAL_CONTROL" ] || [ ! -x /usr/sbin/install2 ] ||
|
||||
echo "$GLOBAL_CONTROL" |
|
||||
tr ' :' '\n ' > /usr/share/install2/control
|
||||
@ -9,14 +9,15 @@ use/live-install: use/live use/metadata use/repo/main \
|
||||
@$(call add_feature)
|
||||
@$(call add,LIVE_PACKAGES,installer-common-stage2)
|
||||
@$(call add,BASE_PACKAGES,installer-common-stage3)
|
||||
@$(call add,THE_LISTS,$(call tags,basesystem && !alterator))
|
||||
@$(call add,LIVE_PACKAGES,$$(LIVE_INSTALL_PKG))
|
||||
@$(call add,LIVE_PACKAGES,alterator-postinstall) # for auto install
|
||||
@$(call add,THE_PACKAGES,alterator-postinstall) # for auto install
|
||||
@$(call add,LIVE_PACKAGES,xterm) # for vnc support
|
||||
@$(call try,INSTALLER,regular) # might be replaced later
|
||||
@$(call add,LIVE_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
|
||||
@$(call add,LIVE_PACKAGES,branding-$$(BRANDING)-alterator)
|
||||
@$(call add,LIVE_PACKAGES,branding-$$(BRANDING)-release)
|
||||
@$(call add,LIVE_PACKAGES,installer-distro-$$(INSTALLER)-stage3)
|
||||
@$(call add,THE_PACKAGES,branding-$$(BRANDING)-alterator)
|
||||
@$(call add,THE_PACKAGES,branding-$$(BRANDING)-release)
|
||||
@$(call add,THE_PACKAGES,installer-distro-$$(INSTALLER)-stage3)
|
||||
@$(call add,LIVE_PACKAGES,glibc-gconv-modules) # for guile22
|
||||
@$(call add,LIVE_PACKAGES,curl) # for net install
|
||||
@$(call add,LIVE_PACKAGES,lsof) # for debug alterator-vm
|
||||
@ -35,7 +36,7 @@ use/live-install/pkg: use/live-install
|
||||
# set up remote repositories within installed system out-of-box
|
||||
use/live-install/repo: use/live-install; @:
|
||||
ifneq (,$(filter-out e2k%,$(ARCH)))
|
||||
@$(call add,BASE_PACKAGES,installer-feature-online-repo)
|
||||
@$(call add,LIVE_PACKAGES,installer-feature-online-repo)
|
||||
endif
|
||||
|
||||
# this one expects external vncviewer to come
|
||||
|
||||
17
features.in/repo/live/image-scripts.d/90-repo-mirror
Executable file
17
features.in/repo/live/image-scripts.d/90-repo-mirror
Executable file
@ -0,0 +1,17 @@
|
||||
#!/bin/sh
|
||||
|
||||
repo_script=/usr/share/install2/postinstall.d/99-online-repo.sh
|
||||
|
||||
[ -f "$repo_script" ] || exit 0
|
||||
[ -n "$GLOBAL_REPO" ] || exit 0
|
||||
|
||||
MIRROR="${GLOBAL_REPO#*/}" # alt, heanet, kiev, yandex, ...
|
||||
|
||||
repo_source="/etc/apt/sources.list.d/$MIRROR.list"
|
||||
|
||||
if [ ! -s "$repo_source" ]; then
|
||||
echo "Error: $repo_source does not exist" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sed -i "s;repo_source=.*;repo_source=$repo_source;" "$repo_script"
|
||||
@ -23,3 +23,11 @@ use/services/lvm2-disable: use/services
|
||||
@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmetad)
|
||||
@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-lvmpolld)
|
||||
@$(call add,DEFAULT_SERVICES_DISABLE,lvm2-monitor)
|
||||
|
||||
use/services/bluetooth-enable: use/services
|
||||
@$(call add,DEFAULT_SERICES_ENABLE,bluetooth)
|
||||
@$(call add,SYSTEMD_USER_SERVICES_ENABLE,obex.service)
|
||||
|
||||
use/services/bluetooth-disable: use/services
|
||||
@$(call add,DEFAULT_SERICES_DISABLE,bluetooth)
|
||||
@$(call add,SYSTEMD_USER_SERVICES_DISABLE,obex.service)
|
||||
|
||||
144
features.in/services/live/image-scripts.d/10-services-install
Executable file
144
features.in/services/live/image-scripts.d/10-services-install
Executable file
@ -0,0 +1,144 @@
|
||||
#!/bin/sh
|
||||
|
||||
# this script piggybacks service status information
|
||||
# into the system to be installed (instead of applying
|
||||
# it to rootfs being formed immediately)
|
||||
|
||||
# NB: The script is a copy of a similar script from install2,
|
||||
# but is executed during a live build if there is an classic
|
||||
# installer in it.
|
||||
|
||||
[ -x /usr/sbin/install2 ] || exit 0
|
||||
|
||||
STATUS=`mktemp`
|
||||
CONFDIR=/usr/share/install2
|
||||
CHECK_FILES=
|
||||
|
||||
. shell-config
|
||||
|
||||
switch() {
|
||||
local sname="$1"
|
||||
|
||||
sname="${sname%.service}"
|
||||
sname="${sname%.socket}"
|
||||
sname="${sname%.target}"
|
||||
|
||||
[ -n "$CHECK_FILES" ] && \
|
||||
grep -E -qs "^[[:blank:]]*$sname(.service|.socket|.target)?[[:blank:]]*$" \
|
||||
$CHECK_FILES && return ||:
|
||||
|
||||
# avoid service duplication: drop sevice without unit type
|
||||
[ "$sname" = "$1" ] || shell_config_del "$STATUS" "$sname"
|
||||
|
||||
case "$2" in
|
||||
on|off|enabled|disabled|mask|unmask)
|
||||
shell_config_set "$STATUS" "$1" "$2";;
|
||||
esac
|
||||
}
|
||||
|
||||
for f in services-on services-off systemd-enabled systemd-disabled; do
|
||||
[ -s "$CONFDIR/$f" ] || continue
|
||||
CHECK_FILES="$CHECK_FILES $CONFDIR/$f"
|
||||
done
|
||||
|
||||
# defaults (most likely features.in ones)
|
||||
for i in $GLOBAL_DEFAULT_SERVICES_ENABLE; do switch $i on; done
|
||||
for i in $GLOBAL_DEFAULT_SERVICES_DISABLE; do switch $i off; done
|
||||
|
||||
# explicitly specified behaviour (e.g. via conf.d)
|
||||
for i in $GLOBAL_SERVICES_ENABLE; do switch $i on; done
|
||||
for i in $GLOBAL_SERVICES_DISABLE; do switch $i off; done
|
||||
|
||||
# defaults systemd services
|
||||
for i in $GLOBAL_DEFAULT_SYSTEMD_SERVICES_ENABLE; do switch $i on; done
|
||||
for i in $GLOBAL_DEFAULT_SYSTEMD_SERVICES_DISABLE; do switch $i off; done
|
||||
|
||||
# explicitly specified behaviour systemd services
|
||||
for i in $GLOBAL_SYSTEMD_SERVICES_ENABLE; do switch $i on; done
|
||||
for i in $GLOBAL_SYSTEMD_SERVICES_DISABLE; do switch $i off; done
|
||||
|
||||
SERVICES="$GLOBAL_DEFAULT_SERVICES_ENABLE $GLOBAL_DEFAULT_SERVICES_DISABLE"
|
||||
SERVICES="$SERVICES $GLOBAL_SERVICES_ENABLE $GLOBAL_SERVICES_DISABLE"
|
||||
SERVICES="$SERVICES $GLOBAL_DEFAULT_SYSTEMD_SERVICES_ENABLE $GLOBAL_DEFAULT_SYSTEMD_SERVICES_DISABLE"
|
||||
SERVICES="$SERVICES $GLOBAL_SYSTEMD_SERVICES_ENABLE $GLOBAL_SYSTEMD_SERVICES_DISABLE"
|
||||
SERVICES="$(echo $SERVICES | tr " " "\n" | sort -u)"
|
||||
|
||||
for i in $SERVICES; do
|
||||
onoff="$(shell_config_get "$STATUS" "$i")"
|
||||
[ -n "$onoff" ] || continue
|
||||
echo "$i" >> "$CONFDIR"/services-"$onoff"
|
||||
done
|
||||
|
||||
if [ -s "$CONFDIR"/services-on ]; then
|
||||
if [ -s "$CONFDIR"/systemd-enabled ] || [ -n "$GLOBAL_SYSTEMD_SERVICES_ENABLE" ]; then
|
||||
cat "$CONFDIR"/services-on >>"$CONFDIR"/systemd-enabled
|
||||
rm "$CONFDIR"/services-on
|
||||
else
|
||||
cp -a "$CONFDIR"/{services-on,systemd-enabled}
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -s "$CONFDIR"/services-off ]; then
|
||||
if [ -s "$CONFDIR"/systemd-disabled ] || [ -n "$GLOBAL_SYSTEMD_SERVICES_DISABLE" ]; then
|
||||
cat "$CONFDIR"/services-off >>"$CONFDIR"/systemd-disabled
|
||||
rm "$CONFDIR"/services-off
|
||||
else
|
||||
cp -a "$CONFDIR"/{services-off,systemd-disabled}
|
||||
fi
|
||||
fi
|
||||
|
||||
rm "$STATUS"
|
||||
|
||||
# Mask|Unmask systemd units
|
||||
STATUS=`mktemp`
|
||||
CHECK_FILES=
|
||||
|
||||
for f in systemd-mask systemd-unmask; do
|
||||
[ -s "$CONFDIR/$f" ] || continue
|
||||
CHECK_FILES="$CHECK_FILES $CONFDIR/$f"
|
||||
done
|
||||
|
||||
for i in $GLOBAL_SYSTEMD_SERVICES_MASK; do switch $i mask; done
|
||||
for i in $GLOBAL_SYSTEMD_SERVICES_UNMASK; do switch $i unmask; done
|
||||
|
||||
SERVICES="$GLOBAL_SYSTEMD_SERVICES_MASK $GLOBAL_SYSTEMD_SERVICES_UNMASK"
|
||||
SERVICES="$(echo $SERVICES | tr " " "\n" | sort -u)"
|
||||
|
||||
for i in $SERVICES; do
|
||||
maskunmask="$(shell_config_get "$STATUS" "$i")"
|
||||
[ -n "$maskunmask" ] || continue
|
||||
echo "$i" >> "$CONFDIR"/systemd-"$maskunmask"ed
|
||||
done
|
||||
|
||||
rm "$STATUS"
|
||||
|
||||
# Enable|Disable logind services
|
||||
STATUS=`mktemp`
|
||||
CHECK_FILES=
|
||||
|
||||
for f in systemd-user-enabled systemd-user-disabled; do
|
||||
[ -s "$CONFDIR/$f" ] || continue
|
||||
CHECK_FILES="$CHECK_FILES $CONFDIR/$f"
|
||||
done
|
||||
|
||||
# defaults logind services
|
||||
for i in $GLOBAL_DEFAULT_SYSTEMD_USER_SERVICES_ENABLE; do switch $i enabled; done
|
||||
for i in $GLOBAL_DEFAULT_SYSTEMD_USER_SERVICES_DISABLE; do switch $i disabled; done
|
||||
|
||||
# explicitly specified behaviour logind services
|
||||
for i in $GLOBAL_SYSTEMD_USER_SERVICES_ENABLE; do switch $i enabled; done
|
||||
for i in $GLOBAL_SYSTEMD_USER_SERVICES_DISABLE; do switch $i disabled; done
|
||||
|
||||
SERVICES="$GLOBAL_DEFAULT_SYSTEMD_USER_SERVICES_ENABLE $GLOBAL_DEFAULT_SYSTEMD_USER_SERVICES_DISABLE"
|
||||
SERVICES="$SERVICES $GLOBAL_SYSTEMD_USER_SERVICES_ENABLE $GLOBAL_SYSTEMD_USER_SERVICES_DISABLE"
|
||||
SERVICES="$(echo "$SERVICES" | tr ' ' '\n' | sort -u)"
|
||||
|
||||
for i in $SERVICES; do
|
||||
onoff="$(shell_config_get "$STATUS" "$i")"
|
||||
[ -n "$onoff" ] || continue
|
||||
echo "$i" >> "$CONFDIR"/systemd-user-"$onoff"
|
||||
done
|
||||
|
||||
rm "$STATUS"
|
||||
|
||||
:
|
||||
@ -6,15 +6,11 @@ use/stage2:: sub/stage1
|
||||
@$(call xport,STAGE1_PACKAGES)
|
||||
@$(call xport,STAGE1_KCONFIG)
|
||||
|
||||
ifneq (,$(filter-out e2k%,$(ARCH)))
|
||||
ifeq (sisyphus,$(BRANCH))
|
||||
ifeq (,$(filter-out sisyphus p11 c11%,$(BRANCH)))
|
||||
use/stage2:: use/initrd-bootchain; @:
|
||||
else
|
||||
use/stage2:: use/initrd-propagator; @:
|
||||
endif
|
||||
else
|
||||
use/stage2:: use/initrd-propagator; @:
|
||||
endif
|
||||
|
||||
# building blocks for propagator's module cove
|
||||
use/stage2/ata use/stage2/drm use/stage2/fs use/stage2/hid use/stage2/md \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
use/xdg-user-dirs: use/control
|
||||
use/xdg-user-dirs: use/control use/services
|
||||
@$(call add_feature)
|
||||
@$(call add,CONTROL,xdg-user-dirs:enabled)
|
||||
@$(call add,THE_PACKAGES,xdg-user-dirs)
|
||||
|
||||
7
pkg.in/groups/centaurus/801-grp-pol.directory
Normal file
7
pkg.in/groups/centaurus/801-grp-pol.directory
Normal file
@ -0,0 +1,7 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Type=Directory
|
||||
Name=Group policies
|
||||
X-Alterator-PackageList=centaurus/zero
|
||||
X-Alterator-Required=no
|
||||
Name[ru_RU]=Групповые политики
|
||||
@ -1,9 +1,9 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Type=Directory
|
||||
Name=Group policy managing tool
|
||||
Name=Administration tools
|
||||
X-Alterator-PackageList=centaurus/admc
|
||||
X-Alterator-Required=no
|
||||
X-Alterator-Parent=centaurus/80-desktop
|
||||
Name[ru_RU]=Инструмент управления групповыми политиками
|
||||
|
||||
X-Alterator-Parent=centaurus/801-grp-pol
|
||||
X-Alterator-Depends=centaurus/mate centaurus/xorg
|
||||
Name[ru_RU]=Инструменты администрирования
|
||||
|
||||
8
pkg.in/groups/centaurus/gptemplates.directory
Normal file
8
pkg.in/groups/centaurus/gptemplates.directory
Normal file
@ -0,0 +1,8 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Type=Directory
|
||||
Name=Group policy templates
|
||||
X-Alterator-PackageList=centaurus/gptemplates
|
||||
X-Alterator-Required=no
|
||||
X-Alterator-Parent=centaurus/801-grp-pol
|
||||
Name[ru_RU]=Шаблоны групповых политик
|
||||
8
pkg.in/groups/centaurus/gpupdate.directory
Normal file
8
pkg.in/groups/centaurus/gpupdate.directory
Normal file
@ -0,0 +1,8 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Type=Directory
|
||||
Name=Client (means of application)
|
||||
X-Alterator-PackageList=centaurus/gpupdate
|
||||
X-Alterator-Required=no
|
||||
X-Alterator-Parent=centaurus/801-grp-pol
|
||||
Name[ru_RU]=Клиент (средства применения)
|
||||
@ -5,5 +5,5 @@ Name=MATE desktop enviroment
|
||||
X-Alterator-PackageList=centaurus/mate
|
||||
X-Alterator-Parent=centaurus/80-desktop
|
||||
X-Alterator-Depends=systemd centaurus/xorg
|
||||
X-Alterator-Required=yes
|
||||
X-Alterator-Required=no
|
||||
Name[ru_RU]=Среда MATE
|
||||
|
||||
@ -4,6 +4,6 @@ Type=Directory
|
||||
Name=NetworkManager daemon
|
||||
X-Alterator-PackageList=centaurus/nm-daemon
|
||||
X-Alterator-Parent=centaurus/901-net-if-mgt
|
||||
X-Alterator-Required=yes
|
||||
X-Alterator-Required=no
|
||||
Name[ru_RU]=Система управления NetworkManager
|
||||
|
||||
|
||||
@ -4,5 +4,5 @@ Type=Directory
|
||||
Name=Office packages
|
||||
X-Alterator-PackageList=centaurus/gnome-office
|
||||
X-Alterator-Parent=centaurus/80-desktop
|
||||
X-Alterator-Required=yes
|
||||
X-Alterator-Required=no
|
||||
Name[ru_RU]=Офисный пакет
|
||||
|
||||
@ -3,7 +3,7 @@ Encoding=UTF-8
|
||||
Type=Directory
|
||||
Name=Samba Server
|
||||
X-Alterator-PackageList=centaurus/samba
|
||||
X-Alterator-Required=no
|
||||
X-Alterator-Required=yes
|
||||
X-Alterator-Parent=centaurus/20-server-apps
|
||||
Name[ru_RU]=Сервер Samba
|
||||
Categories=Server;Networking
|
||||
|
||||
@ -4,6 +4,6 @@ Type=Directory
|
||||
Name=Systemd network configuration daemon
|
||||
X-Alterator-PackageList=centaurus/systemd-networkd
|
||||
X-Alterator-Parent=centaurus/901-net-if-mgt
|
||||
X-Alterator-Required=no
|
||||
X-Alterator-Required=yes
|
||||
Name[ru_RU]=Система управления Systemd-networkd
|
||||
|
||||
|
||||
@ -4,5 +4,5 @@ Type=Directory
|
||||
Name=Main Components (Xorg)
|
||||
X-Alterator-PackageList=centaurus/xorg
|
||||
X-Alterator-Parent=centaurus/80-desktop
|
||||
X-Alterator-Required=yes
|
||||
X-Alterator-Required=no
|
||||
Name[ru_RU]=Основные компоненты (Xorg)
|
||||
|
||||
@ -1 +1 @@
|
||||
interactivesystem
|
||||
interactivesystem@META
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
kernel-headers-std-def@!E2K
|
||||
kernel-headers-modules-std-def@!E2K
|
||||
kernel-headers-un-def@!E2K
|
||||
kernel-headers-modules-un-def@!E2K
|
||||
kernel-headers-elbrus-def@E2K
|
||||
kernel-headers-modules-elbrus-def@E2K
|
||||
|
||||
@ -1,9 +1,2 @@
|
||||
admc
|
||||
alterator-gpupdate
|
||||
gpupdate
|
||||
local-policy
|
||||
admx-basealt
|
||||
samba-dc-common
|
||||
admx-firefox
|
||||
admx-chromium
|
||||
gpui
|
||||
|
||||
@ -2,6 +2,8 @@
|
||||
anacron
|
||||
apt
|
||||
apt-repo
|
||||
apt-rsync
|
||||
apt-https
|
||||
glibc-gconv-modules
|
||||
glibc-locales
|
||||
glibc-nss
|
||||
@ -15,6 +17,7 @@ udev
|
||||
udev-extras
|
||||
pciutils
|
||||
su
|
||||
sudo
|
||||
|
||||
make-initrd
|
||||
make-initrd-lvm
|
||||
@ -52,6 +55,7 @@ mdadm
|
||||
mtools
|
||||
ntfs-3g
|
||||
sfdisk
|
||||
fdisk
|
||||
usbutils
|
||||
xfsprogs
|
||||
smartmontools
|
||||
@ -67,6 +71,7 @@ sg3_utils
|
||||
|
||||
# servers
|
||||
openssh-server
|
||||
openssh-server-control
|
||||
openssh-common
|
||||
openssh-blacklist
|
||||
postfix
|
||||
@ -117,3 +122,4 @@ glibc-timezones
|
||||
|
||||
alt-issue-server
|
||||
color-prompt-and-man
|
||||
local-policy
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
apache2-mod_php8.0
|
||||
apache2-mod_php8.2
|
||||
tftp
|
||||
|
||||
@ -17,6 +17,7 @@ etckeeper
|
||||
#kernel
|
||||
kernel-build-tools
|
||||
kernel-doc-std
|
||||
kernel-doc-un@!E2K
|
||||
|
||||
c-icap
|
||||
virt-viewer
|
||||
@ -75,11 +76,11 @@ postgresql14-1C-contrib
|
||||
mariadb-server
|
||||
mariadb@META
|
||||
|
||||
php8.0-soap
|
||||
php8.0-calendar
|
||||
php8.0-sockets
|
||||
php8.0-pgsql
|
||||
php8.0-ldap
|
||||
php8.2-soap
|
||||
php8.2-calendar
|
||||
php8.2-sockets
|
||||
php8.2-pgsql
|
||||
php8.2-ldap
|
||||
|
||||
xprobe2
|
||||
|
||||
|
||||
@ -72,6 +72,7 @@ syslinux@X86
|
||||
# kernel
|
||||
kernel-build-tools
|
||||
kernel-doc-std
|
||||
kernel-doc-un@!E2K
|
||||
###kernel-headers-modules-@KERNEL_MOD@
|
||||
###kernel-headers-@KERNEL_MOD@
|
||||
|
||||
|
||||
5
pkg.in/lists/centaurus/gptemplates
Normal file
5
pkg.in/lists/centaurus/gptemplates
Normal file
@ -0,0 +1,5 @@
|
||||
admx-basealt
|
||||
admx-firefox
|
||||
admx-chromium
|
||||
admx-yandex-browser
|
||||
admx-msi-setup
|
||||
3
pkg.in/lists/centaurus/gpupdate
Normal file
3
pkg.in/lists/centaurus/gpupdate
Normal file
@ -0,0 +1,3 @@
|
||||
gpupdate
|
||||
alterator-gpupdate
|
||||
task-auth-ad-sssd
|
||||
@ -209,3 +209,5 @@ alterator-net-bridge
|
||||
|
||||
gparted
|
||||
tigervnc
|
||||
theme-mate-windows
|
||||
mc-desktop
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
samba
|
||||
samba-common-tools
|
||||
samba-usershares
|
||||
samba-client
|
||||
|
||||
@ -2,9 +2,3 @@ task-samba-dc@META
|
||||
bind-utils
|
||||
ldap-user-tools
|
||||
task-auth-ad-sssd
|
||||
alterator-gpupdate
|
||||
gpupdate
|
||||
local-policy
|
||||
admx-basealt
|
||||
admx-firefox
|
||||
admx-chromium
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
virtualbox@x86_64
|
||||
kernel-modules-virtualbox-std-def@x86_64
|
||||
kernel-modules-virtualbox-un-def@x86_64
|
||||
|
||||
@ -31,6 +31,7 @@ xorg-drv-wacom
|
||||
xinit
|
||||
xterm
|
||||
wm-select
|
||||
xinput
|
||||
|
||||
#fonts
|
||||
fonts-ttf-liberation
|
||||
@ -56,5 +57,8 @@ xorg-drv-qxl
|
||||
kernel-modules-drm-std-def@!E2K
|
||||
kernel-modules-drm-nouveau-std-def@!E2K
|
||||
kernel-modules-v4l-std-def@!E2K
|
||||
kernel-modules-drm-un-def@!E2K
|
||||
kernel-modules-drm-nouveau-un-def@!E2K
|
||||
kernel-modules-v4l-un-def@!E2K
|
||||
|
||||
cpio
|
||||
|
||||
@ -70,3 +70,5 @@ xdg-user-dirs
|
||||
android-tools@!riscv64
|
||||
|
||||
screen
|
||||
|
||||
mobile-broadband-provider-info
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
interactivesystem
|
||||
interactivesystem@META
|
||||
vim-console
|
||||
|
||||
sfdisk
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
sysvinit
|
||||
rsyslog-classic
|
||||
etcnet
|
||||
interactivesystem
|
||||
interactivesystem@META
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
interactivesystem
|
||||
interactivesystem@META
|
||||
apt
|
||||
|
||||
@ -2,4 +2,4 @@
|
||||
Type=Directory
|
||||
Name=Office Server
|
||||
Name[ru_RU]=Офисный сервер
|
||||
X-Alterator-Groups=centaurus/dhcp-server-a centaurus/dns-server-a centaurus/ftp-server-a centaurus/mail-server-a centaurus/mysql-server-a centaurus/netinst centaurus/http-server centaurus/dns-server centaurus/bacula-server centaurus/kvm-server centaurus/xorg centaurus/alterator centaurus/mate centaurus/office centaurus/cups centaurus/nm-daemon
|
||||
X-Alterator-Groups=centaurus/dhcp-server-a centaurus/dns-server-a centaurus/mysql-server-a centaurus/netinst centaurus/http-server centaurus/dns-server centaurus/bacula-server centaurus/kvm-server centaurus/alterator centaurus/samba centaurus/cups centaurus/systemd-networkd
|
||||
|
||||
@ -2,4 +2,4 @@
|
||||
Type=Directory
|
||||
Name=Samba-DC Server (AD controller)
|
||||
Name[ru_RU]=Сервер Samba-DC (контроллер AD)
|
||||
X-Alterator-Groups=centaurus/dhcp-server-a centaurus/mail-server-a centaurus/mysql-server-a centaurus/netinst centaurus/freenx-server centaurus/http-server centaurus/dns-server centaurus/bacula-server centaurus/kvm-server centaurus/xorg centaurus/sambaDC centaurus/cups centaurus/sogo centaurus/nm-daemon
|
||||
X-Alterator-Groups=centaurus/dns-server-a centaurus/mysql-server-a centaurus/http-server centaurus/dns-server centaurus/bacula-server centaurus/kvm-server centaurus/sambaDC centaurus/gptemplates centaurus/cups centaurus/systemd-networkd
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user