Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
mkimage-profiles
Commits
791a236a
Commit
791a236a
authored
Mar 22, 2014
by
Michael Shigorin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
install2: make vnc cleanup conditional
At least don't purge it with no questions answered. Thanks naf@ for posting #29901.
parent
d587fa5f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
2 deletions
+14
-2
config.mk
features.in/install2/config.mk
+5
-0
90-install2-cleanup-bloat
...stall2/install2/image-scripts.d/90-install2-cleanup-bloat
+1
-2
91-install2-cleanup
....in/install2/install2/image-scripts.d/91-install2-cleanup
+8
-0
No files found.
features.in/install2/config.mk
View file @
791a236a
...
...
@@ -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)
features.in/install2/install2/image-scripts.d/90-install2-cleanup-bloat
View file @
791a236a
...
...
@@ -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
...
...
features.in/install2/install2/image-scripts.d/91-install2-cleanup
0 → 100755
View file @
791a236a
#!/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
--
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment