diff --git a/conf.d/desktop.mk b/conf.d/desktop.mk index 4502a107..6bebe553 100644 --- a/conf.d/desktop.mk +++ b/conf.d/desktop.mk @@ -10,4 +10,6 @@ distro/icewm: distro/desktop-base \ use/cleanup/alterator @$(call add,BASE_LISTS,$(call tags,icewm desktop)) +distro/desktop-systemd: distro/icewm use/systemd + endif diff --git a/conf.d/live.mk b/conf.d/live.mk index 0807db2d..baa4d448 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -5,6 +5,8 @@ distro/live: distro/.base use/live/base use/power/acpi/cpufreq distro/rescue: distro/.base use/rescue use/syslinux/ui-menu distro/dos: distro/.init use/dos use/syslinux/ui-menu +distro/live-systemd: distro/.base use/live/base use/systemd + distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum @$(call add,LIVE_PACKAGES,livecd-isomd5sum) diff --git a/conf.d/server.mk b/conf.d/server.mk index a6692a7e..f83770d5 100644 --- a/conf.d/server.mk +++ b/conf.d/server.mk @@ -12,6 +12,8 @@ distro/server-mini: distro/server-base use/cleanup/x11-alterator $(call tags,base && (server || network || security || pkg))) @$(call add,BASE_LISTS,$(call tags,extra network)) +distro/server-systemd: distro/server-mini use/systemd + distro/server-ovz: distro/server-base \ use/hdt use/rescue use/firmware/server use/power/acpi/button \ use/cleanup/x11-alterator diff --git a/features.in/systemd/README b/features.in/systemd/README new file mode 100644 index 00000000..5e8d09a9 --- /dev/null +++ b/features.in/systemd/README @@ -0,0 +1,3 @@ +Эта фича заменяет в базовой системе sysvinit на systemd; +в настоящее время является экспериментальной, читайте +http://www.altlinux.org/systemd diff --git a/features.in/systemd/config.mk b/features.in/systemd/config.mk new file mode 100644 index 00000000..c4bef76a --- /dev/null +++ b/features.in/systemd/config.mk @@ -0,0 +1,4 @@ +use/systemd: + @$(call add,FEATURES,systemd) + @$(call add,COMMON_PACKAGES,systemd systemd-units systemd-sysvinit) + @$(call add,COMMON_PACKAGES,installer-feature-systemd-stage3) diff --git a/features.in/systemd/stage2/image-scripts.d/50-fstab b/features.in/systemd/stage2/image-scripts.d/50-fstab new file mode 100755 index 00000000..7fae3a64 --- /dev/null +++ b/features.in/systemd/stage2/image-scripts.d/50-fstab @@ -0,0 +1,4 @@ +#!/bin/sh -efu +# aufs2 root is rw in reality + +echo "/dev/root / auto defaults 0 0" >>/etc/fstab