From 07d58b91ccc32623b46530892a1c543a51c924ad Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Sun, 3 Mar 2013 23:54:53 +0400 Subject: [PATCH] regular.mk: introduced regular-rescue This one was just asking to be built for quite a long time; http://sourceforge.net/apps/trac/smartmontools/wiki/LiveCDs specifically accenting use of smartmontools 6.0 has finally persuaded me to roll out yet another rescue livecd, that is on the regular basis. --- conf.d/regular.mk | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 3ee78119..7095a6c3 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -1,15 +1,17 @@ # regular build/usage images ifeq (distro,$(IMAGE_CLASS)) +# common ground +distro/.regular-bare: distro/.base +vmguest +wireless \ + use/efi/signed use/luks use/memtest use/kernel/net + @$(call try,SAVE_PROFILE,yes) + # WM base target -distro/.regular-base: distro/.base +live +wireless use/live/ru \ - use/live/install use/live/repo use/live/net-eth use/x11/3d-free \ - use/efi/signed use/luks +vmguest use/memtest use/branding \ - use/kernel/net +distro/.regular-base: distro/.regular-bare +live use/live/ru use/live/install \ + use/live/repo use/live/net-eth use/x11/3d-free use/luks use/branding @$(call add,LIVE_LISTS,$(call tags,base regular)) @$(call add,LIVE_LISTS,$(call tags,rescue extra)) @$(call add,THE_BRANDING,indexhtml notes alterator) - @$(call try,SAVE_PROFILE,yes) # DE base target # TODO: use/plymouth/live when luks+plymouth is done, see also #28255 @@ -54,4 +56,8 @@ distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \ distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @: +distro/regular-rescue: distro/.regular-bare use/rescue \ + use/syslinux/ui/menu use/efi/refind + @$(call set,KFLAVOURS,un-def) + endif