Commit 791a236a authored by Michael Shigorin's avatar Michael Shigorin

install2: make vnc cleanup conditional

At least don't purge it with no questions answered. Thanks naf@ for posting #29901.
parent d587fa5f
......@@ -12,6 +12,7 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
@$(call add,BASE_PACKAGES,installer-common-stage3)
@$(call add,BASE_LISTS,$(call tags,basesystem))
@$(call xport,BASE_BOOTLOADER)
@$(call xport,INSTALL2_CLEANUP_PACKAGES)
# doesn't use/install2/fs on purpose (at least so far)
use/install2/full: use/install2/packages use/install2/kms \
......@@ -48,3 +49,7 @@ use/install2/jfs:
use/install2/reiserfs:
@$(call add,SYSTEM_PACKAGES,reiserfsprogs)
# when VNC installation is less welcome than a few extra megs
use/install2/cleanup/vnc:
@$(call add,INSTALL2_CLEANUP_PACKAGES,x11vnc xorg-xvfb)
......@@ -16,12 +16,11 @@ rm -rf /usr/share/guile/*/{*.txt,scripts}
rm -rf /usr/share/awk/
### could it be handled with any grace?
### TODO: x11vnc, xorg-xvfb: fix installer-common-stage2
rpmquery -a cpp\* gcc\* perl-base file ipv6calc \
bind-utils libbind \
libsoup\* \
libGL glxinfo xdriinfo \
make make-initrd x11vnc xorg-xvfb \
make make-initrd \
| xargs -r rpmi -e --nodeps --
### TODO: unless LUKS luks feature is requested we can also drop
......
#!/bin/sh
# this relates to install2 feature's cleanup script and executes later
[ -n "$GLOBAL_INSTALL2_CLEANUP_PACKAGES" ] || exit 0
rpmquery -a $GLOBAL_INSTALL2_CLEANUP_PACKAGES |
xargs -r rpmi -e --nodeps --
:
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