Commit e3f928ae authored by Anton Midyukov's avatar Anton Midyukov

Merge tag 'v1.5.16' into sisyphus

v1.5.16.0 - log.mk: fix abort on error when STDOUT=1 (ALT bug 48863) - datetime: set TIME ZONE, use alterator-datetime-functions, set TIME_ZONE, TIME_UTC via kernel cmdline for distro images - grub: add new langs: kk_KZ, ky_KG, uz_UZ - live: fix mistake in 90-live-cleanup-drivers - live, grub, isolinux: new target use/live/rescue - sound: Enable pipewire socket instead service
parents 4e33c794 378f9e32
# regular build/usage images # regular build/usage images
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
distro/.regular-initrd:: use/stage2/ata use/stage2/fs use/stage2/hid \
use/stage2/mmc use/stage2/scsi use/stage2/usb; @:
ifneq (,$(filter-out i586,$(ARCH)))
distro/.regular-initrd:: use/stage2/net use/stage2/net-nfs use/stage2/cifs \
use/stage2/rtc use/stage2/drm use/stage2/sbc ; @:
endif
# common ground (really lowlevel) # common ground (really lowlevel)
distro/.regular-bare: distro/.base use/kernel/net use/docs/license \ distro/.regular-bare: distro/.base use/kernel/net use/docs/license \
use/stage2/ata use/stage2/fs use/stage2/hid use/stage2/md \ distro/.regular-initrd use/tty
use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \
use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \
use/stage2/drm use/tty
@$(call try,SAVE_PROFILE,yes) @$(call try,SAVE_PROFILE,yes)
@$(call add,STAGE1_PACKAGES,firmware-linux) @$(call add,STAGE1_PACKAGES,firmware-linux)
@$(call add,STAGE1_KMODULES,drm) @$(call add,STAGE1_KMODULES,drm)
...@@ -175,7 +180,8 @@ distro/regular-xfce-install: distro/.regular-install-x11-systemd \ ...@@ -175,7 +180,8 @@ distro/regular-xfce-install: distro/.regular-install-x11-systemd \
distro/regular-gnome-install: distro/.regular-install-x11-systemd mixin/regular-gnome \ distro/regular-gnome-install: distro/.regular-install-x11-systemd mixin/regular-gnome \
use/kernel/latest +plymouth; @: use/kernel/latest +plymouth; @:
distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde; @: distro/regular-lxde: distro/.regular-desktop use/x11/lightdm/gtk \
mixin/regular-lxde; @:
distro/regular-mate: distro/.regular-gtk mixin/regular-mate; @: distro/regular-mate: distro/.regular-gtk mixin/regular-mate; @:
......
=== features.in/datetime === === features.in/datetime ===
Данная фича предназначена для настройки даты, времени, часовых поясов и т.д. Данная фича предназначена для настройки часового пояса и переключения
хранения времени в BIOS между UTC (по Гринвичу) и местным временем.
Пока доступна только переменная TIME_UTC для выбора между местным временем и * TIME_UTC
UTC. Задайте TIME_UTC=0, чтобы переключиться на местное время. ** Переключает хранение времени в BIOS с UTC (по Гринвичу) на местное время
** значение: 0 - местное; 1 - UTC
* TIME_ZONE
** Задаёт часовой пояс
** значение: формат регион/город из каталога /usr/share/zoneinfo/регион/город
use/datetime: use/datetime: ; @:
ifeq (,$(filter-out ve vm,$(IMAGE_CLASS)))
@$(call add_feature) @$(call add_feature)
@$(call try,TIME_UTC,1) @$(call add,THE_PACKAGES,alterator-datetime-functions)
@$(call xport,TIME_UTC) @$(call xport,TIME_UTC)
@$(call xport,TIME_ZONE)
endif
ifeq (distro,$(IMAGE_CLASS))
@$(call add,LIVE_PACKAGES,livecd-timezone)
@$(call add,STAGE2_BOOTARGS,utc=$$(TIME_UTC))
@$(call add,STAGE2_BOOTARGS,tz=$$(TIME_ZONE))
endif
#!/bin/sh -efux #!/bin/sh -efux
adjtime_file=/etc/adjtime
sysconfigclock_file=/etc/sysconfig/clock
TIME_UTC="${GLOBAL_TIME_UTC:-}" TIME_UTC="${GLOBAL_TIME_UTC:-}"
[ "$TIME_UTC" = 0 ] || TIME_UTC=1 in_zone="${GLOBAL_TIME_ZONE:-}"
if [ -s "$sysconfigclock_file" ]; then . alterator-datetime-functions
if [ "$TIME_UTC" = 1 ]; then
sed -i 's/^UTC=.*/UTC=true/' "$sysconfigclock_file"
else
sed -i 's/^UTC=.*/UTC=false/' "$sysconfigclock_file"
fi
fi
if [ "$TIME_UTC" = 1 ]; then if [ -n "$TIME_UTC" ]; then
ADJTIME=UTC [ "$TIME_UTC" = 0 ] || TIME_UTC=1
else write_utc "$TIME_UTC"
ADJTIME=LOCAL
fi fi
cat > "$adjtime_file" <<EOF if [ -n "$in_zone" ]; then
0.0 0 0 write_zone
0 fi
$ADJTIME
EOF
menuentry $"Rescue LiveCD" --id 'live_rescue' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ nosplash vga=@bootvga@ @rescue_bootargs@ $EFI_BOOTARGS lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
...@@ -5,6 +5,9 @@ submenu $"Change language (press F2)" --hotkey 'f2' --id 'lang' { ...@@ -5,6 +5,9 @@ submenu $"Change language (press F2)" --hotkey 'f2' --id 'lang' {
"en_US=English" \ "en_US=English" \
"pt_BR=Portuguese" \ "pt_BR=Portuguese" \
"uk_UA=Ukrainian" \ "uk_UA=Ukrainian" \
"uz_UZ=Uzbek" \
"ky_KG=Kyrgyz" \
"kk_KZ=Kazakh" \
; do ; do
regexp -s 2:langname -s 1:langcode '(.*)=(.*)' "$langstr" regexp -s 2:langname -s 1:langcode '(.*)=(.*)' "$langstr"
for locale in @LOCALES@; do for locale in @LOCALES@; do
......
...@@ -99,8 +99,13 @@ else ...@@ -99,8 +99,13 @@ else
use/live/suspend: use/live; @: use/live/suspend: use/live; @:
endif endif
# live as Rescue
use/live/rescue: use/live use/grub/live-rescue.cfg use/syslinux/live-rescue.cfg
@$(call add,LIVE_PACKAGES,startup-rescue)
@$(call add,LIVE_LISTS,tagged/base+rescue)
# for kiosks # for kiosks
use/live/runapp: use/live; use/live/runapp: use/live
@$(call add,LIVE_PACKAGES,livecd-runapp) @$(call add,LIVE_PACKAGES,livecd-runapp)
@$(call xport,LIVE_RUNAPP_BINARY) @$(call xport,LIVE_RUNAPP_BINARY)
......
#!/bin/sh -efu
# don't cripple the image to be copied over
[ -n "${GLOBAL_LIVE_INSTALL-}" ] || \
[ -x /usr/sbin/live-install ] || \
[ -x /usr/sbin/livecd-install ] && exit 0
[ -x /sbin/rescue-launcher ] || [ -x /usr/bin/rescue-shell-show ] || exit 0
# for systemd only
rpm -q systemd-sysvinit >/dev/null 2>&1 || exit 0
# disable issue "Hello friend, say '$LIVECD_LOGIN' to log in at"
[ ! -f /etc/sysconfig/livecd-user ] ||
sed -i 's/^#LIVECD_NO_ISSUE=1/LIVECD_NO_ISSUE=1/' /etc/sysconfig/livecd-user
mkdir -p /etc/systemd/system/getty@.service.d
cat>>/etc/systemd/system/getty@.service.d/override.conf<<'EOF'
[Service]
Type=simple
ExecStart=
ExecStart=-agetty -a root --noclear - $TERM
EOF
mkdir -p /etc/systemd/system/live-rescue.target.d
cat>>/etc/systemd/system/live-rescue.target<<'EOF'
[Unit]
Description=Live Rescue System
Documentation=man:systemd.special(7)
Requires=basic.target network.target getty.target
Conflicts=rescue.service rescue.target multi-user.target
Conflicts=altlinux-first_time.service vconsole-setup-kludge@tty1.service
Before=altlinux-first_time.service vconsole-setup-kludge@.service
After=basic.target rescue.service rescue.target multi-user.target
After=getty.target
AllowIsolate=yes
EOF
cat>>/root/.bash_profile<<'EOF'
if grep -qsv 'init=' /proc/cmdline; then
EOF
[ -x /sbin/rescue-launcher ] && cat>>/root/.bash_profile<<'EOF'
if grep -wqs autorun /proc/cmdline; then
if [ -x /sbin/rescue-launcher ]; then
if [ "$(tty 2>/dev/null)" = "/dev/tty1" ]; then
/sbin/rescue-launcher "$@"
fi
fi
fi
EOF
[ -x /usr/bin/rescue-shell-show ] && cat>>/root/.bash_profile<<'EOF'
rescue-shell-show
EOF
echo "fi" >> /root/.bash_profile
#!/bin/sh -e #!/bin/sh -e
# don't cripple the image to be copied over # don't cripple the image to be copied over
[ -n "$GLOBAL_LIVE_INSTALL"] || \ [ -n "$GLOBAL_LIVE_INSTALL" ] || \
[ -x /usr/sbin/live-install ] || \ [ -x /usr/sbin/live-install ] || \
[ -x /usr/sbin/livecd-install ] && exit 0 [ -x /usr/sbin/livecd-install ] && exit 0
......
...@@ -18,6 +18,6 @@ use/sound/pulse: use/sound ...@@ -18,6 +18,6 @@ use/sound/pulse: use/sound
use/sound/pipewire: use/sound use/sound/pipewire: use/sound
@$(call set,THE_SOUND,sound/pipewire) @$(call set,THE_SOUND,sound/pipewire)
@$(call add,DEFAULT_SYSTEMD_USER_SERVICES_ENABLE,pipewire pipewire-pulse) @$(call add,DEFAULT_SYSTEMD_USER_SERVICES_ENABLE,pipewire.socket pipewire-pulse.socket)
@$(call add,THE_PACKAGES,wireplumber) @$(call add,THE_PACKAGES,wireplumber)
@$(call add,DEFAULT_SYSTEMD_USER_SERVICES_ENABLE,wireplumber) @$(call add,DEFAULT_SYSTEMD_USER_SERVICES_ENABLE,wireplumber.service)
label live_rescue
menu label ^Rescue LiveCD
kernel /boot/vmlinuz
append initrd=/boot/@initrd@ fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ nosplash showopts vga=@bootvga@ @rescue_bootargs@ lowmem
...@@ -26,7 +26,7 @@ SHELL += -x ...@@ -26,7 +26,7 @@ SHELL += -x
endif endif
ifeq (1,$(STDOUT)) ifeq (1,$(STDOUT))
LOG = 2>&1 | tee -a $(BUILDLOG) LOG = 2>&1 | tee -a $(BUILDLOG)
LOG_STDERR = $(LOG) LOG_STDERR = 2> >(tee -a $(BUILDLOG) >&2) 1>>$(BUILDLOG)
else else
LOG = >>$(BUILDLOG) 2>&1 LOG = >>$(BUILDLOG) 2>&1
LOG_STDERR = 2> >(tee -a $(BUILDLOG) >&2) 1>>$(BUILDLOG) LOG_STDERR = 2> >(tee -a $(BUILDLOG) >&2) 1>>$(BUILDLOG)
......
...@@ -78,7 +78,7 @@ gnustep-LaternaMagica ...@@ -78,7 +78,7 @@ gnustep-LaternaMagica
gnustep-Localize gnustep-Localize
#gnustep-LoginPanel #gnustep-LoginPanel
#gnustep-LuserNET #gnustep-LuserNET
gnustep-Lynkeos #gnustep-Lynkeos
#gnustep-Mixer #gnustep-Mixer
gnustep-Money gnustep-Money
#gnustep-MPDCon #gnustep-MPDCon
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment