Commit c4094423 authored by Anton Midyukov's avatar Anton Midyukov

live-install: remove kernel also when install from squash

Request by Mikhail Efremov sem@.
parent 9e80c254
...@@ -25,3 +25,8 @@ ...@@ -25,3 +25,8 @@
размера iso-образа. размера iso-образа.
Второй вариант не отличается от altinst. Второй вариант не отличается от altinst.
По дефолту пакеты kernel-image и kernel-modules в режиме распаковки образа live
удаляются. Чтобы это предотвратить задайте переменную MAIN_KERNEL_SAVE:
@$(call set,MAIN_KERNEL_SAVE,yes)
...@@ -8,6 +8,8 @@ use/live-install: use/live use/metadata use/repo/main use/l10n \ ...@@ -8,6 +8,8 @@ use/live-install: use/live use/metadata use/repo/main use/l10n \
use/alternatives/xvt/xterm use/alternatives/xvt/xterm
@$(call add_feature) @$(call add_feature)
@$(call set,STAGE2_LIVE_INST,yes) @$(call set,STAGE2_LIVE_INST,yes)
@$(call try,MAIN_KERNEL_SAVE,no)
@$(call xport,MAIN_KERNEL_SAVE)
@$(call add,LIVE_PACKAGES,installer-common-stage2) @$(call add,LIVE_PACKAGES,installer-common-stage2)
@$(call add,THE_PACKAGES,alterator-wizardface) @$(call add,THE_PACKAGES,alterator-wizardface)
@$(call add,THE_LISTS,$(call tags,basesystem && !alterator)) @$(call add,THE_LISTS,$(call tags,basesystem && !alterator))
......
...@@ -7,4 +7,8 @@ RPM_LIVE_LIST="$WORKDIR/.disk/pkglists/live/image/rpm.txt" ...@@ -7,4 +7,8 @@ RPM_LIVE_LIST="$WORKDIR/.disk/pkglists/live/image/rpm.txt"
[ -f "$RPM_LIVE_LIST" ] || exit 1 [ -f "$RPM_LIVE_LIST" ] || exit 1
cd "$WORKDIR/$PREFIX/RPMS.main" cd "$WORKDIR/$PREFIX/RPMS.main"
cat "$RPM_LIVE_LIST" | grep -v kernel-image | grep -v kernel-modules | xargs rm -fv if [ "$GLOBAL_MAIN_KERNEL_SAVE" = yes ]; then
cat "$RPM_LIVE_LIST" | grep -v kernel-image | grep -v kernel-modules | xargs rm -fv
else
cat "$RPM_LIVE_LIST" | xargs rm -fv
fi
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