From a3855183b12f2b7344b072d3563fa19fc782ae67 Mon Sep 17 00:00:00 2001 From: Mikhail Efremov Date: Fri, 17 Mar 2017 19:24:15 +0300 Subject: [PATCH] slinux: Setup correct META_* variables At least META_VOL_ID must be Simply*, otherwise bootloader can't find the install image. --- conf.d/slinux.mk | 4 ++++ features.in/slinux/config.mk | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/conf.d/slinux.mk b/conf.d/slinux.mk index 5455f807..5efbf403 100644 --- a/conf.d/slinux.mk +++ b/conf.d/slinux.mk @@ -4,9 +4,13 @@ ifeq (distro,$(IMAGE_CLASS)) distro/slinux-live: distro/.livecd-install use/slinux/base @$(call add,THE_LISTS,slinux/live-install) + @$(call set,META_VOL_SET,Simply Linux live) + @$(call set,META_VOL_ID,Simply Linux live/$(ARCH)) distro/slinux: distro/.installer use/slinux/full use/rescue/base @$(call set,INSTALLER,simply-linux) @$(call add,MAIN_GROUPS,slinux/dropbox slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/games-full-steam slinux/graphics-base slinux/graphics-full-blender slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell slinux/graphics-full-synfigstudio slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-pitivi slinux/multimedia-full-sound-juicer slinux/network-base) + @$(call set,META_VOL_SET,Simply Linux) + @$(call set,META_VOL_ID,Simply Linux/$(ARCH)) endif diff --git a/features.in/slinux/config.mk b/features.in/slinux/config.mk index 3ad163d5..8d15fe59 100644 --- a/features.in/slinux/config.mk +++ b/features.in/slinux/config.mk @@ -2,7 +2,7 @@ use/slinux: use/x11 @$(call add_feature) @$(call set,BRANDING,simply-linux) @$(call add,THE_BRANDING,menu xfce-settings system-settings) - @$(call set,META_VOL_SET,Simply Linux) + @$(call set,META_PUBLISHER,BaseALT Ltd) use/slinux/base: use/isohybrid use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse use/luks \ +plymouth +nm use/x11/gtk/nm use/memtest +systemd +wireless use/l10n/default/ru_RU use/live/x11 \