Skip to content

M
mkimage-profiles
Commit abfaf25b authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

Merge tag 'v1.6.0' into sisyphus

v1.6.0 - rename phone.mk -> mobile.mk, drop feature phone - live: refactoring 60-live-rescue-root, add autologin root to serial tty in rescue mode - efi: add mockutil, pesign to rescue only - Add VERSION file for build doc - doc: do not use images from asciidoc, add missing images (fix FTBFS) - mediacheck: show "Error: implantisomd5 is not available" on screen - grub, syslinux: add lowmem to 25install-vnc-* also - Add support patches from image-paches.d/ - Set MKI_VER_MINIMAL=0.3.0, MKI_VER_OPTIMAL=0.3.2 - fix some package lists
parents 87449c7e 303f6a68
Hide whitespace changes
Inline Side-by-side
Showing with 232 additions and 191 deletions
conf.d/mixin.mk
View file @ abfaf25b
......@@ -147,7 +147,6 @@ endif
mixin/xfce-base: use/x11/xfce +nm-gtk \
use/fonts/ttf/redhat use/fonts/ttf/google/extra
@$(call add,THE_BRANDING,xfce-settings)
@$(call add,THE_PACKAGES,xfce4-regular)
@$(call add,THE_PACKAGES,xreader)
@$(call add,THE_PACKAGES,xdg-user-dirs-gtk)
......
conf.d/phone.mk → conf.d/mobile.mk
View file @ abfaf25b
......@@ -6,14 +6,24 @@ ifeq (,$(filter-out aarch64 x86_64,$(ARCH)))
@$(call add,BASE_BOOTARGS,psi=1)
endif
mixin/phone-base: use/ntp/chrony use/repo use/branding/notes use/x11-autostart \
# enables tty on the mobile device using a hotkey
mixin/ttyescape: use/services; @:
ifneq (,$(filter-out riscv64,$(ARCH)))
@$(call add,THE_PACKAGES,hkdm ttyescape)
@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,hkdm)
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/drm use/firmware mixin/ttyescape +plymouth +pipewire
@$(call add,THE_BRANDING,notes indexhtml)
@$(call add,THE_LISTS,mobile/base)
@$(call add,THE_PACKAGES,polkit-rule-mobile)
@$(call add,THE_PACKAGES,mesa-dri-drivers)
@$(call add,THE_PACKAGES,eg25-manager)
@$(call add,THE_PACKAGES,udev-rules-modem-power)
@$(call set,UBOOT_TIMEOUT,5)
@$(call add,USERS,altlinux:271828:1:1)
@$(call set,LOCALES,ru_RU en_US)
@$(call set,LOCALE,ru_RU)
......@@ -27,12 +37,13 @@ mixin/phosh: use/services +nm-gtk4 +nm-native
@$(call set,DEFAULT_SESSION,phosh)
ifeq (vm,$(IMAGE_CLASS))
vm/.phosh: vm/systemd mixin/phone-base mixin/phosh +systemd \
mixin/waydroid use/fonts/ttf/google
vm/.phosh: vm/systemd mixin/mobile-base mixin/phosh +systemd \
mixin/waydroid use/fonts/ttf/google \
use/auto-resize
@$(call add,THE_LISTS,mobile/apps)
@$(call add,THE_PACKAGES,phosh-background-settings)
vm/phosh: vm/.phosh use/tty/S0 use/uboot use/phone/ttyescape +efi \
use/firmware +plymouth +pipewire
vm/phosh: vm/.phosh use/tty/S0 use/uboot +efi
@$(call set,KFLAVOURS,un-def)
ifeq (aarch64,$(ARCH))
@$(call set,VM_PARTTABLE,msdos)
......@@ -41,17 +52,15 @@ endif
endif
ifeq (aarch64,$(ARCH))
# TODO: devicetree ($root)/boot/dtb/rockchip/rk3399-pinephone-pro.dtb
mixin/pinephone: use/firmware use/bootloader/uboot use/tty/S2 \
use/phone/ttyescape +pipewire
mixin/pine: use/bootloader/uboot use/tty/S2
@$(call set,EFI_BOOTLOADER,)
@$(call set,UBOOT_TIMEOUT,5)
@$(call set,KFLAVOURS,pine)
@$(call add,THE_PACKAGES,eg25-manager)
@$(call add,THE_PACKAGES,udev-rules-modem-power)
@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,eg25-manager.service)
ifeq (vm,$(IMAGE_CLASS))
vm/pinephone-phosh: vm/.phosh mixin/pinephone +plymouth; @:
vm/pine-phosh: vm/.phosh mixin/pine; @:
vm/mp-phosh: vm/phosh
@$(call set,KFLAVOURS,mp)
@$(call set,LOCALE,en_US)
endif
endif
conf.d/regular.mk
View file @ abfaf25b
......@@ -6,7 +6,11 @@ distro/.regular-initrd:: use/stage2/ata use/stage2/fs use/stage2/hid \
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 ; @:
use/stage2/rtc use/stage2/sbc ; @:
endif
ifneq (,$(filter-out i586 x86_64,$(ARCH)))
distro/.regular-initrd:: use/stage2/drm ; @:
endif
# common ground (really lowlevel)
......@@ -64,7 +68,8 @@ endif
# DE base target
# 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/firmware/laptop +systemd +systemd-optimal +vmguest \
use/live-install/oem
@$(call add,THE_PACKAGES,bluez)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
......@@ -144,8 +149,8 @@ distro/.regular-install-x11-systemd: distro/.regular-install-x11 \
@$(call add,THE_PACKAGES,bluez)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
distro/regular-icewm: distro/.regular-gtk mixin/regular-icewm \
use/kernel/latest
distro/regular-icewm: distro/.regular-desktop use/x11/lightdm/gtk \
mixin/regular-icewm use/kernel/latest
@$(call add,THE_PACKAGES,icewm-startup-polkit-gnome)
distro/regular-icewm-sysv: distro/.regular-gtk-sysv mixin/regular-icewm \
......@@ -158,12 +163,10 @@ distro/regular-wmaker-sysv: distro/.regular-desktop-sysv \
distro/regular-gnustep-sysv: distro/regular-wmaker-sysv \
mixin/regular-gnustep; @:
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call set,BOOTLOADER,isolinux)
endif
distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
mixin/regular-wmaker mixin/regular-gnustep; @:
distro/regular-gnustep: distro/.regular-desktop use/x11/lightdm/gtk \
mixin/regular-wmaker mixin/regular-gnustep
@$(call add,THE_PACKAGES,wmaker-autostart-polkit-gnome)
distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce; @:
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
......
conf.d/server-v.mk
View file @ abfaf25b
......@@ -76,7 +76,6 @@ distro/.server-v-base: distro/.base distro/.installer \
use/stage2/kms \
use/server/virt use/docs/license use/docs/manual
@$(call add,BASE_LISTS,server-base openssh)
@$(call add,EFI_BOOTARGS,lang=ru_RU)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call set,BOOTLOADER,grubpcboot)
endif
......
doc/Makefile
View file @ abfaf25b
......@@ -13,7 +13,6 @@ endif
PROJECT = mkimage-profiles
TOPLEVEL_DOC = $(PROJECT).asciidoc
RESOURCE_FILES = /etc/asciidoc
A2X = a2x
FXC = .fop.xconf
......@@ -24,7 +23,7 @@ DEPTH = 3
# common args (and the source file to process) come last
XSLT_ARGS = --stringparam toc.max.depth $(DEPTH)
COMMON_ARGS = -d book -a lang="$L" $(DEST) $(VERBOSE) $(TOPLEVEL_DOC)
HTML_ARGS = -a data-uri --icons -r $(RESOURCE_FILES) -r . \
HTML_ARGS = -a data-uri --icons -r . \
--xsltproc-opts='$(XSLT_ARGS)' $(COMMON_ARGS)
# most convenient deliverables
......@@ -47,8 +46,7 @@ prep:
@if [ -n "$(BUILDDIR)" ]; then mkdir -p "$(BUILDDIR)"; fi
man:
@VERSION="$$(sed -rn 's/^Version: ([0-9.]+).*$$/\1/p' \
../.gear/mkimage-profiles.spec)"; \
@VERSION="$$(cat ../VERSION)"; \
sed -e "s,@VERSION@,$$VERSION,g" \
< mkimage-profiles.7.in \
> mkimage-profiles.7
......
doc/features.txt
View file @ abfaf25b
......@@ -6,6 +6,7 @@
или запрашивают скрипты, которые могут быть оформлены как:
* scripts.d/ или image-scripts.d/ различных стадий;
* в виде патчей в image-patches.d/ различных стадий;
* пакеты installer-feature-*
(тж. https://www.altlinux.org/Installer/beans).
......
doc/mkimage-profiles.7.in
View file @ abfaf25b
.\" Copyright (C) 2010-2020 Michael Shigorin <mike@altlinux.org>
.\" Copyright (C) 2020-2021 Anton Midyukov <antohami@altlinux.org>
.\" Copyright (C) 2020-2024 Anton Midyukov <antohami@altlinux.org>
.\"
.\" Documentation for mkimage-profiles project.
.\"
......@@ -17,7 +17,7 @@
.\" along with this program; if not, write to the Free Software
.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
.\"
.TH "MKIMAGE-PROFILES" "9" "October 2021" "mkimage-profiles @VERSION@" "ALT"
.TH "MKIMAGE-PROFILES" "mkimage-profiles @VERSION@" "ALT"
.SH "NAME"
mkimage-profiles \- ALT distribution family metaprofile
.SH "SYNOPSIS"
......
features.in/build-ve/lib/90-build-ve.mk
View file @ abfaf25b
......@@ -25,5 +25,5 @@ IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
$(BASE_PACKAGES_REGEXP)
all: $(GLOBAL_DEBUG) \
build-image copy-subdirs copy-tree run-image-scripts pack-image \
postprocess $(GLOBAL_CLEAN_WORKDIR)
build-image copy-subdirs copy-tree run-image-patches run-image-scripts \
pack-image postprocess $(GLOBAL_CLEAN_WORKDIR)
features.in/build-vm/lib/90-build-vm.mk
View file @ abfaf25b
......@@ -120,5 +120,5 @@ run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL)
all: $(GLOBAL_DEBUG) \
build-image copy-subdirs copy-tree run-image-scripts pack-image \
convert-image postprocess $(GLOBAL_CLEAN_WORKDIR)
build-image copy-subdirs copy-tree run-image-patches run-image-scripts \
pack-image convert-image postprocess $(GLOBAL_CLEAN_WORKDIR)
features.in/efi/config.mk
View file @ abfaf25b
......@@ -8,15 +8,12 @@ EFI_LISTS := $(call tags,base efi)
use/efi:
@$(call add_feature)
@$(call set,MKI_VER_MINIMAL,0.2.12) # it's official now
@$(call set,MKI_VER_OPTIMAL,0.2.17) # for EFI_BOOTARGS
@$(call try,EFI_BOOTLOADER,grub-efi) # default one
@$(call xport,EFI_BOOTLOADER)
@$(call add,COMMON_LISTS,$(EFI_LISTS))
ifeq (distro,$(IMAGE_CLASS))
@$(call add,INSTALL2_PACKAGES,dosfstools fatresize)
@$(call add,STAGE1_KCONFIG,EFI EFI_PARTITION EFIVAR_FS)
@$(call add,EFI_BOOTARGS,$$(STAGE2_BOOTARGS))
ifeq (x86_64,$(ARCH))
@$(call add,THE_PACKAGES,$$(EFI_SHELL))
endif
......@@ -33,7 +30,7 @@ use/efi/shell: use/efi
use/efi/signed: use/efi
@$(call set,EFI_CERT,altlinux)
@$(call add,COMMON_PACKAGES,shim-signed)
@$(call add,COMMON_PACKAGES,mokutil pesign)
@$(call add,RESCUE_PACKAGES,mokutil pesign)
@$(call add,RESCUE_PACKAGES,openssl)
ifeq (,$(filter-out p10 c10f%,$(BRANCH)))
@$(call add,STAGE1_PACKAGES,shim-signed-installer-kludge grub-efi alt-uefi-certs dosfstools mtools)
......
features.in/grub/README
View file @ abfaf25b
......@@ -19,8 +19,6 @@
* BOOTARGS -- дополнительные аргументы загрузчику;
* EFI_BOOTARGS -- дополнительные аргументы загрузчику;
* BOOTLOADER -- isolinux (реализовано с оглядкой на grub/grub4);
* BOOTVGA -- видеорежим, запрашиваемый у ядра (параметр vga=);
......
features.in/grub/cfg.in/00defaults.cfg
View file @ abfaf25b
......@@ -12,7 +12,6 @@ insmod minicmd
insmod normal
insmod test
set timeout=@timeout@
if [ "$grub_platform" = "efi" ]; then set EFI_BOOTARGS='@efi_bootargs@'; fi
if [ ! "$lang" ]; then lang=@LOCALE@; fi
if [ -s $pfxfat/grubenv ]; then
load_env --file $pfxfat/grubenv
......
features.in/grub/cfg.in/20install2.cfg
View file @ abfaf25b
menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang lowmem
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
features.in/grub/cfg.in/21live-install.cfg
View file @ abfaf25b
......@@ -2,7 +2,7 @@
menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ lowmem vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ lowmem vga=@bootvga@ @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
features.in/grub/cfg.in/25install-vnc-connect.cfg
View file @ abfaf25b
......@@ -2,7 +2,7 @@
menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ lovmem headless no_alt_virt_keyboard vncconnect=IP lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
features.in/grub/cfg.in/25install-vnc-listen.cfg
View file @ abfaf25b
......@@ -2,7 +2,7 @@
menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ nosplash @bootargs@ lowmem headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
......
features.in/grub/cfg.in/26live-install-vnc-connect.cfg
View file @ abfaf25b
......@@ -2,7 +2,7 @@
menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash lowmem @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncconnect=IP lang=$lang
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncconnect=IP lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
features.in/grub/cfg.in/26live-install-vnc-listen.cfg
View file @ abfaf25b
......@@ -2,7 +2,7 @@
menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash lowmem @bootargs@ $EFI_BOOTARGS headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ nosplash lowmem @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
......
features.in/grub/cfg.in/30live.cfg
View file @ abfaf25b
menuentry $"LiveCD (no hard disk needed)" --id 'live' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ lowmem vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ lowmem vga=@bootvga@ @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
......
features.in/grub/cfg.in/32live_rw.cfg
View file @ abfaf25b
menuentry $"LiveCD with sessions support" --id 'session' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ live_rw vga=@bootvga@ @bootargs@ $EFI_BOOTARGS lang=$lang
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ live_rw vga=@bootvga@ @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
features.in/grub/cfg.in/33live-rescue.cfg
View file @ abfaf25b
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
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ nosplash vga=@bootvga@ @rescue_bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
......
features.in/grub/cfg.in/80rescue.cfg
View file @ abfaf25b
menuentry $"Rescue LiveCD" --id 'rescue' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS lowmem
linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
features.in/grub/cfg.in/82rescue_rw.cfg
View file @ abfaf25b
menuentry $"Rescue with sessions support" --id 'rescue_session' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS live_rw
linux /boot/vmlinuz$KFLAVOUR changedisk fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ live_rw
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
features.in/grub/cfg.in/83rescue_fm.cfg
View file @ abfaf25b
menuentry $"Forensic mode (leave disks alone)" --id 'rescue_forensic' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 forensic hash=@rescue_hash@ lowmem
linux /boot/vmlinuz fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ max_loop=16 forensic hash=@rescue_hash@ lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
features.in/grub/cfg.in/84rescue_remote.cfg
View file @ abfaf25b
menuentry $"Rescue with remote SSH access (DHCP)" --id 'rescue_remote' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@ lowmem
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ nosplash @rescue_bootargs@ max_loop=16 ip=dhcp port=22 rootpw=AUTO hash=@rescue_hash@ lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
features.in/grub/cfg.in/85mediacheck.cfg
View file @ abfaf25b
menuentry $"Check this media for defects" --id 'mediachk' {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR live @initrd_bootargs@ @stagename@=mediacheck lowmem mediacheck=1 nosplash @bootargs@ $EFI_BOOTARGS
linux /boot/vmlinuz$KFLAVOUR live @initrd_bootargs@ @stagename@=mediacheck lowmem mediacheck=1 nosplash @bootargs@
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
features.in/grub/cfg.in/88netinstall-live.cfg 0 → 100644
View file @ abfaf25b
submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' {
submenu $"Install over network" {
menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
}
submenu $"Live over network" {
menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
}
submenu $"Rescue over network" {
menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@ lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live systemd.unit=live-rescue.target @bootargs@ lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
}
}
features.in/grub/cfg.in/88netinstall.cfg
View file @ abfaf25b
......@@ -2,25 +2,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' {
submenu $"Install over network" {
menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang lowmem
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=altinst @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=altinst @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=altinst @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=altinst @bootargs@ $EFI_BOOTARGS lang=$lang lowmem
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=altinst @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
......@@ -28,25 +28,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' {
submenu $"Live over network" {
menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang lowmem
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live @bootargs@ $EFI_BOOTARGS lang=$lang lowmem
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
......@@ -54,25 +54,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' {
submenu $"Install Live over network" {
menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ $EFI_BOOTARGS lang=$lang lowmem
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ $EFI_BOOTARGS lang=$lang
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ $EFI_BOOTARGS lang=$lang
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ $EFI_BOOTARGS lang=$lang lowmem
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=live init=/usr/sbin/install2-init @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
......@@ -80,25 +80,25 @@ submenu $"Bootloading over network (press F4)" --hotkey 'f4' --id 'network' {
submenu $"Rescue over network" {
menuentry $"Server NFS" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=rescue @bootargs@ $EFI_BOOTARGS lowmem
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:nfs ip=dhcp stagename=rescue @bootargs@ lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server FTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=rescue @bootargs@ $EFI_BOOTARGS
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:ftp ip=dhcp stagename=rescue @bootargs@
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server HTTP" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=rescue @bootargs@ $EFI_BOOTARGS
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:http ip=dhcp stagename=rescue @bootargs@
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
menuentry $"Server SAMBA" {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=rescue @bootargs@ $EFI_BOOTARGS lowmem
linux /boot/vmlinuz$KFLAVOUR @initrd_typeargs@=method:cifs ip=dhcp stagename=rescue @bootargs@ lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
......
features.in/grub/generate.mk
View file @ abfaf25b
......@@ -84,10 +84,6 @@ distro: bootargs
# pass over additional parameters, if any
bootargs: clean
@if [ -n "$(EFI_BOOTARGS)" ]; then \
sed -i "s,@efi_bootargs@,$(EFI_BOOTARGS)," $(DSTCFGS); \
fi; \
sed -i "s,@efi_bootargs@,," $(DSTCFGS)
@if [ -n "$(STAGE2_BOOTARGS)" ]; then \
sed -i "s,$(STAGE2_BOOTARGS),," $(DSTCFGS); \
sed -i "s,@bootargs@,$(STAGE2_BOOTARGS)," $(DSTCFGS); \
......
features.in/isohybrid/config.mk
View file @ abfaf25b
use/isohybrid:
@$(call add_feature)
@$(call try,ISOHYBRID,1)
@$(call set,MKI_VER_MINIMAL,0.2.5)
features.in/live-install/config.mk
View file @ abfaf25b
......@@ -52,3 +52,8 @@ use/live-install/vnc/full: use/live-install/vnc/listen use/live-install/vnc/conn
# prepare bootloader for software suspend (see also live)
use/live-install/suspend:
@$(call add,BASE_PACKAGES,installer-feature-desktop-suspend-stage2)
use/live-install/oem: use/live-install
@$(call add,LIVE_PACKAGES,installer-feature-oem-stage2)
@$(call add,MAIN_PACKAGES,alterator-setup)
@$(call add,MAIN_PACKAGES,installer-feature-alterator-setup-stage2)
features.in/live/live/image-scripts.d/30-live-rescue-root → features.in/live/live/image-scripts.d/60-live-rescue-root
View file @ abfaf25b
......@@ -5,23 +5,33 @@
[ -x /usr/sbin/live-install ] || \
[ -x /usr/sbin/livecd-install ] && exit 0
[ -x /sbin/rescue-launcher ] || [ -x /usr/bin/rescue-shell-show ] || exit 0
which rescue-shell-show >/dev/null 2>&1 || exit 0
# for systemd only
rpm -q systemd-sysvinit >/dev/null 2>&1 || exit 0
ls -l /sbin/init |grep -q systemd || 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
[ ! -f /etc/sysconfig/livecd-user.conf ] ||
echo 'LIVECD_NO_ISSUE=1' >> /etc/sysconfig/livecd-user.conf
# Autologin root to tty's
mkdir -p /etc/systemd/system/getty@.service.d
cat>>/etc/systemd/system/getty@.service.d/override.conf<<'EOF'
cat>>/etc/systemd/system/getty@.service.d/live-rescue.conf<<'EOF'
[Service]
Type=simple
ExecStart=
ExecStart=-agetty -a root --noclear - $TERM
EOF
# Autologin root to serial tty's
mkdir -p /etc/systemd/system/serial-getty@.service.d
cat>>/etc/systemd/system/serial-getty@.service.d/live-rescue.conf<<'EOF'
[Service]
Type=simple
ExecStart=
ExecStart=-agetty -a root --noclear --keep-baud 115200,57600,38400,9600 - $TERM
EOF
mkdir -p /etc/systemd/system/live-rescue.target.d
cat>>/etc/systemd/system/live-rescue.target<<'EOF'
[Unit]
......@@ -37,24 +47,14 @@ 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 -qs 'systemd.unit=live-rescue.target' /proc/cmdline; then
if grep -wqs autorun /proc/cmdline; then
if [ -x /sbin/rescue-launcher ]; then
if which rescue-launcher >/dev/null 2>&1; then
if [ "$(tty 2>/dev/null)" = "/dev/tty1" ]; then
/sbin/rescue-launcher "$@"
rescue-launcher "$@"
fi
fi
fi
EOF
[ -x /usr/bin/rescue-shell-show ] && cat>>/root/.bash_profile<<'EOF'
rescue-shell-show
which rescue-shell-show >/dev/null 2>&1 && rescue-shell-show
fi
EOF
echo "fi" >> /root/.bash_profile
features.in/mediacheck/config.mk
View file @ abfaf25b
......@@ -3,7 +3,7 @@ use/mediacheck: use/stage2 sub/stage2@mediacheck \
use/grub/mediacheck.cfg use/syslinux/mediacheck.cfg
@$(call add_feature)
@if ! command -v implantisomd5 >/dev/null 2>&1; then \
echo "Error: implantisomd5 is not available! Need install isomd5sum"; exit 1; \
echo "Error: implantisomd5 is not available! Need install isomd5sum" >&2; exit 1; \
fi
@$(call add,POSTPROCESS_TARGETS,90mediacheck)
else
......
features.in/phone/README deleted 100644 → 0
View file @ 87449c7e
Customization for rk3399s compatible models, including pinephone
pro.
features.in/phone/config.mk deleted 100644 → 0
View file @ 87449c7e
use/phone:
@$(call add_feature)
@$(call add,THE_PAKAGES,wallpapers-mobile)
# enables tty on the phone using a hotkey
use/phone/ttyescape: use/phone use/services
ifneq (,$(filter-out riscv64,$(ARCH)))
@$(call add,THE_PACKAGES,hkdm ttyescape)
endif
@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,hkdm)
features.in/phone/image-scripts.d/81-alsa-ucm2 deleted 100755 → 0
View file @ 87449c7e
#!/bin/sh -efu
# Workaround is needed due to bug in old tow-boot versions
# (until next release):
# https://github.com/Tow-Boot/Tow-Boot/issues/171
ln -s "../../PinePhonePro/PINE64-PinePhonePro-.conf" "/usr/share/alsa/ucm2/conf.d/simple-card/simple-card.conf"
features.in/phone/rootfs/files/etc/dconf/db/local.d/00_background deleted 100644 → 0
View file @ 87449c7e
[org/gnome/desktop/background]
picture-uri='file:///usr/share/wallpapers/mobile/720x1440/basealt-background.png'
features.in/phone/rootfs/files/etc/skel/.config/gtk-3.0/gtk.css deleted 100644 → 0
View file @ 87449c7e
/* TWEAKS-START phosh-applist-background */
phosh-app-grid {
background-image: url("file:///usr/share/wallpapers/mobile/720x1440/basealt-background.png");
background-size: cover;
background-position: center;
}
/* TWEAKS-END phosh-applist-background */
/* TWEAKS-START phosh-lockscreen-background */
phosh-lockscreen, .phosh-lockshield {
background-image: url("file:///usr/share/wallpapers/mobile/720x1440/basealt-lockscreen.png");
background-size: cover;
background-position: center;
}
/* TWEAKS-END phosh-lockscreen-background */
features.in/server/config.mk
View file @ abfaf25b
......@@ -51,10 +51,10 @@ use/server/groups/services: use/server
@$(call add,MAIN_GROUPS,server/dhcp server/dns server/mail)
@$(call add,MAIN_GROUPS,server/apache2 server/nginx)
@$(call add,MAIN_GROUPS,server/mariadb server/pgsql)
@$(call add,MAIN_GROUPS,server/php8.1)
@$(call add,MAIN_GROUPS,server/php8.2)
@$(call add,MAIN_GROUPS,server/ftp server/rsync)
@$(call add,MAIN_GROUPS,server/kvm)
@$(call add,DEFAULT_SERVICES_ENABLE,libvirtd)
@$(call add,DEFAULT_SERVICES_DISABLE,php8.0-fpm php8.1-fpm)
@$(call add,DEFAULT_SERVICES_DISABLE,php8.2-fpm)
use/server/groups/base: use/server/groups/tools use/server/groups/services; @:
features.in/stage2/config.mk
View file @ abfaf25b
......@@ -44,6 +44,10 @@ use/stage2/cifs: use/stage2/net-cifs
use/stage2/net-install: use/stage2/net use/stage2/cifs \
use/stage2/net-nfs use/grub/netinstall.cfg; @:
# grub submenu 'Network installation' with stagename live only
use/stage2/net-install-live: use/stage2/net use/stage2/cifs \
use/stage2/net-nfs use/grub/netinstall-live.cfg; @:
# eth0 instead of enp0s3
use/stage2/net-eth: use/stage2
@$(call add,STAGE1_PACKAGES,udev-rule-generator-net)
......
features.in/syslinux/cfg.in/25grub-install-vnc-connect.cfg deleted 100644 → 0
View file @ 87449c7e
label vncconnect
menu label VNC client (edit to set server IP address)
kernel /boot/vmlinuz
append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncconnect=IP
features.in/syslinux/cfg.in/25grub-install-vnc-listen.cfg deleted 100644 → 0
View file @ 87449c7e
label vncpasswd
menu label Install @relname@ (headless with DHCP+VNC) (password VNCPWD)
kernel /boot/vmlinuz
append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD
features.in/syslinux/cfg.in/25install-vnc-connect.cfg
View file @ abfaf25b
label vncconnect
menu label ^VNC install (edit to set server IP address)
kernel /boot/vmlinuz
append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ headless no_alt_virt_keyboard vncconnect=IP
append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ lowmem headless no_alt_virt_keyboard vncconnect=IP
features.in/syslinux/cfg.in/25install-vnc-listen.cfg
View file @ abfaf25b
label vncpasswd
menu label VNC install (<Tab>, set pass^word and connect here)
kernel /boot/vmlinuz
append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD
append initrd=/boot/@initrd@ fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ showopts nosplash @bootargs@ lowmem headless no_alt_virt_keyboard vncpassword=VNCPWD
features.in/uuid-iso/config.mk
View file @ abfaf25b
......@@ -3,7 +3,6 @@ UUID_ISO_SHRT := $(shell echo $(UUID_ISO) | sed 's/-//g')
use/uuid-iso:
@$(call add_feature)
@$(call set,MKI_VER_OPTIMAL,0.2.41)
@$(call set,UUID_ISO_SHRT,$(UUID_ISO_SHRT))
@$(call set,UUID_ISO,$(UUID_ISO))
@$(call xport,UUID_ISO)
image.in/Makefile
View file @ abfaf25b
......@@ -7,8 +7,8 @@ OUT_LINK := out
# there were mkimage fixes induced by mkimage-profile development
# - minimal version is bumped for critical bugfixes/features
# - optimal one relates to the less universally relevant bits
MKI_VER_MINIMAL = 0.1.7
MKI_VER_OPTIMAL = 0.2.6
MKI_VER_MINIMAL = 0.3.0
MKI_VER_OPTIMAL = 0.3.2
include distcfg.mk
include functions.mk
......
pkg.in/groups/server/php8.1.directory → pkg.in/groups/server/php8.2.directory
View file @ abfaf25b
[Desktop Entry]
Encoding=UTF-8
Type=Directory
Name=PHP 8.1 support
X-Alterator-PackageList=server/php8.1
Name=PHP 8.2 support
X-Alterator-PackageList=server/php8.2
X-Alterator-Required=no
X-Alterator-Conflicts=server/php8.0
Name[ru_RU]=Поддержка PHP 8.1
Name[ru_RU]=Поддержка PHP 8.2
Categories=Server;Networking
pkg.in/lists/server/pgsql
View file @ abfaf25b
postgresql11-server
postgresql11-contrib
postgresql16-server
postgresql16-contrib
pkg.in/lists/server/pgsql-1C
View file @ abfaf25b
postgresql10-1C-server
postgresql15-1C-server
pkg.in/lists/server/php8.1 deleted 100644 → 0
View file @ 87449c7e
apache2-mod_php8.1
php8.1
php8.1-curl
php8.1-dba
php8.1-dom
php8.1-exif
php8.1-fileinfo
php8.1-fpm-fcgi
php8.1-gd2
php8.1-imap
php8.1-ldap
php8.1-mbstring
php8.1-mcrypt
php8.1-memcached
php8.1-mysqlnd
php8.1-mysqlnd-mysqli
php8.1-pdo
php8.1-pdo_mysql
php8.1-pdo_odbc
php8.1-pdo_pgsql
php8.1-pdo_sqlite
php8.1-pgsql
#php8.1-xmlrpc
php8.1-xsl
php8.1-zip
pkg.in/lists/server/php8.2 0 → 100644
View file @ abfaf25b
apache2-mod_php8.2
php8.2
php8.2-curl
php8.2-dba
php8.2-dom
php8.2-exif
php8.2-fileinfo
php8.2-fpm-fcgi
php8.2-gd2
php8.2-imap
php8.2-ldap
php8.2-mbstring
php8.2-mcrypt
php8.2-memcached
php8.2-mysqlnd
php8.2-mysqlnd-mysqli
php8.2-pdo
php8.2-pdo_mysql
php8.2-pdo_odbc
php8.2-pdo_pgsql
php8.2-pdo_sqlite
php8.2-pgsql
#php8.2-xmlrpc
php8.2-xsl
php8.2-zip
pkg.in/lists/tagged/builder+extra
View file @ abfaf25b
......@@ -6,6 +6,7 @@ gear
hasher
iproute2
mkimage-profiles
isomd5sum
net-tools
parallel
pv
......
pkg.in/lists/tagged/regular+icewm
View file @ abfaf25b
......@@ -18,5 +18,5 @@ pnmixer
icewm-startup-pnmixer
leafpad
gqview
gpicview
screengrab
pkg.in/lists/tagged/rescue+x11
View file @ abfaf25b
# mostly X11 counterparts/GUIs to some rescue+extra packages
binwalk
dsniff-X11@X86
dvdisaster@X86
extract
gparted
......
pkg.in/lists/tagged/server+zabbix
View file @ abfaf25b
zabbix-server-mysql
zabbix-phpfrontend-apache2-mod_php7
zabbix-phpfrontend-apache2-mod_php8.2
zabbix-agent
zabbix-preinstall
......@@ -7,10 +7,10 @@ zabbix-preinstall
MySQL-server
MySQL-client
php7-gd2
php7-mbstring
php7-mysqli
php7-sockets
php8.2-gd2
php8.2-mbstring
php8.2-mysqli
php8.2-sockets
postfix
mailx
pkg.in/lists/tools/diag
View file @ abfaf25b
# diagnostic tools
dsniff
iftop
lft
mtr
......
sub.in/stage2/Makefile
View file @ abfaf25b
......@@ -70,8 +70,8 @@ include $(MKIMAGE_PREFIX)/targets.mk
GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
all: | $(GLOBAL_DEBUG) \
build-image run-image-scripts copy-tree run-scripts pack-image \
$(GLOBAL_CLEAN_WORKDIR)
build-image run-image-patches run-image-scripts copy-tree run-scripts \
pack-image $(GLOBAL_CLEAN_WORKDIR)
# dummy
debug:: ;
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