From 21325bb436ef542002f5f798d449b47fcd01b6b6 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Fri, 4 May 2012 18:34:25 +0300 Subject: [PATCH] simply += localboot It's a bit simpler to choose "boot from hdd" than to eject a disk/ISO. No need for the specific apt-conf either. --- conf.d/live.mk | 2 +- conf.d/simply.mk | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/conf.d/live.mk b/conf.d/live.mk index 993bc4c8..f9ca8105 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -31,7 +31,7 @@ distro/live-builder: distro/.live-base use/dev/mkimage use/dev/repo distro/live-install: distro/.live-base use/syslinux/localboot.cfg @$(call add,LIVE_PACKAGES,live-install) -distro/.livecd-install: distro/.live-base +distro/.livecd-install: distro/.live-base use/syslinux/localboot.cfg @$(call add,LIVE_PACKAGES,livecd-install) distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @: diff --git a/conf.d/simply.mk b/conf.d/simply.mk index 4f6472da..66b99c41 100644 --- a/conf.d/simply.mk +++ b/conf.d/simply.mk @@ -7,6 +7,5 @@ distro/live-simply: distro/.livecd-install use/isohybrid use/slinux \ use/branding/complete @$(call add,THE_PACKAGES,apt-conf-sisyphus) @$(call add,THE_LISTS,slinux/live-install) - @$(call add,THE_PACKAGES,apt-conf-sisyphus) ### endif