e2k: add live-install feature support

features.in/e2k/config.mk

@@ -4,7 +4,6 @@ use/e2k: use/tty/S0 use/l10n/default/ru_RU
 	@$(call add,BASE_PACKAGES,installer-feature-e2k-fix-clock-stage3)
 	@$(call add,LIVE_PACKAGES,installer-feature-e2k-fix-boot-stage2)
 	@$(call add,LIVE_PACKAGES,installer-feature-e2k-ignore-cf-stage2)
-	@$(call add,LIVE_PACKAGES,livecd-installer-features)
 	@$(call add,LIVE_PACKAGES,blacklist-ide)	# avoid overwriting hda
 	@$(call add,STAGE2_PACKAGES,agetty)
 	@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-xorg-conf-stage2)

features.in/e2k/scripts.d/20-e2k-boot

@@ -22,29 +22,43 @@ default=$default
 timeout=3
 EOF
 
-for i in live altinst rescue; do
-	[ -f "$i" ] || continue
+for i in live altinst liveinst rescue; do
+	if [ "$i" = liveinst ]; then
+		[ -f live ] || continue
+		[ ! -f altinst ] || continue
+		[ -f Metadata/pkg-groups.tar ] || continue
+	else
+		[ -f "$i" ] || continue
+	fi
 
-	if [ "$i" = "altinst" ]; then
+	case "$i" in
+	altinst)
 		label=install
 		stage2=
-	else
+	;;
+	liveinst)
+		label=install
+		stage2="stagename=live"
+		init="init=/usr/sbin/install2-init"
+	;;
+	*)
 		label="$i"
 		stage2="stagename=$i"
-	fi
+	;;
+	esac
 
 	cat >> boot.conf << EOF
 
 label=$label
     partition=0
     image=/boot/image.0
-    cmdline=console=ttyS0,115200 console=tty0 hardreset fastboot live automatic=method:cdrom ${stage2:+$stage2 }${GLOBAL_STAGE2_BOOTARGS:+$GLOBAL_STAGE2_BOOTARGS }${GLOBAL_BOOT_LANG:+lang=$GLOBAL_BOOT_LANG}
+    cmdline=console=ttyS0,115200 console=tty0 hardreset fastboot live automatic=method:cdrom ${stage2:+$stage2 }${init:+$init }${GLOBAL_STAGE2_BOOTARGS:+$GLOBAL_STAGE2_BOOTARGS }${GLOBAL_BOOT_LANG:+lang=$GLOBAL_BOOT_LANG}
     initrd=/boot/initrd.img
 
 label=${label}_flash
     partition=0
     image=/boot/image.0
-    cmdline=console=ttyS0,115200 console=tty0 hardreset fastboot live lowmem automatic=method:disk,label:altinst,directory:/ ${stage2:+$stage2 }${GLOBAL_STAGE2_BOOTARGS:+$GLOBAL_STAGE2_BOOTARGS }${GLOBAL_BOOT_LANG:+lang=$GLOBAL_BOOT_LANG}
+    cmdline=console=ttyS0,115200 console=tty0 hardreset fastboot live lowmem automatic=method:disk,label:altinst,directory:/ ${stage2:+$stage2 }${init:+$init }${GLOBAL_STAGE2_BOOTARGS:+$GLOBAL_STAGE2_BOOTARGS }${GLOBAL_BOOT_LANG:+lang=$GLOBAL_BOOT_LANG}
     initrd=/boot/initrd.img
 EOF
 done