diff --git a/conf.d/live.mk b/conf.d/live.mk index 70d8f16f..cf545524 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -30,6 +30,9 @@ 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 use/syslinux/localboot.cfg + @$(call add,LIVE_PACKAGES,livecd-install) + distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @: distro/live-razorqt: distro/.live-desktop +razorqt; @: distro/live-tde: distro/.live-desktop use/live/ru +tde; @: diff --git a/sub.in/stage2/image-scripts.d/99cleanup-boot b/sub.in/stage2/image-scripts.d/99cleanup-boot index b98ecf16..cee75e47 100755 --- a/sub.in/stage2/image-scripts.d/99cleanup-boot +++ b/sub.in/stage2/image-scripts.d/99cleanup-boot @@ -3,4 +3,4 @@ # (unless it's a live-install): # it's been booted already -[ -x /usr/sbin/live-install ] || rm -f /boot/* +[ -x /usr/sbin/live-install ] || [ -x /usr/sbin/livecd-install ] || rm -f /boot/*