Skip to content

M
mkimage-profiles
You need to sign in or sign up before continuing.
Commit 01b47fb5 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

e2k: add live-install feature support

parent 242f35a5
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 7 deletions
features.in/e2k/config.mk
View file @ 01b47fb5
...@@ -4,7 +4,6 @@ use/e2k: use/tty/S0 use/l10n/default/ru_RU ...@@ -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,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-fix-boot-stage2)
@$(call add,LIVE_PACKAGES,installer-feature-e2k-ignore-cf-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,LIVE_PACKAGES,blacklist-ide) # avoid overwriting hda
@$(call add,STAGE2_PACKAGES,agetty) @$(call add,STAGE2_PACKAGES,agetty)
@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-xorg-conf-stage2) @$(call add,INSTALL2_PACKAGES,installer-feature-e2k-xorg-conf-stage2)
......
features.in/e2k/scripts.d/20-e2k-boot
View file @ 01b47fb5
...@@ -22,29 +22,43 @@ default=$default ...@@ -22,29 +22,43 @@ default=$default
timeout=3 timeout=3
EOF EOF
for i in live altinst rescue; do 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 [ -f "$i" ] || continue
fi
if [ "$i" = "altinst" ]; then case "$i" in
altinst)
label=install label=install
stage2= stage2=
else ;;
liveinst)
label=install
stage2="stagename=live"
init="init=/usr/sbin/install2-init"
;;
*)
label="$i" label="$i"
stage2="stagename=$i" stage2="stagename=$i"
fi ;;
esac
cat >> boot.conf << EOF cat >> boot.conf << EOF
label=$label label=$label
partition=0 partition=0
image=/boot/image.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 initrd=/boot/initrd.img
label=${label}_flash label=${label}_flash
partition=0 partition=0
image=/boot/image.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 initrd=/boot/initrd.img
EOF EOF
done done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment