diff --git a/anaconda/installclasses/qubes.py b/anaconda/installclasses/qubes.py
index 3f1693d..d40a155 100644
--- a/anaconda/installclasses/qubes.py
+++ b/anaconda/installclasses/qubes.py
@@ -44,18 +44,11 @@ class InstallClass(BaseInstallClass):
"now.")
_descriptionFields = (productName,)
sortPriority = 20000
- if not productName.startswith("Red Hat Enterprise"):
- hidden = 1
+ hidden = 1
bootloaderTimeoutDefault = 5
- tasks = [(N_("Minimal"), ["core", "qubes"]),
- (N_("Desktop"),
- ["backup-client", "base", "compat-libraries", "fonts",
- "core", "qubes", "basic-desktop", "desktop-platform",
- "general-desktop", "graphical-admin-tools", "input-methods",
- "legacy-x", "x11"]),
- ]
+ tasks = [(N_("Minimal"), ["base", "base-x", "kde-desktop", "qubes" ]) ]
bugFiler = BugzillaFiler("http://qubes-os.org/trac/",
"http://qubes-os.org/",
@@ -75,7 +68,7 @@ class InstallClass(BaseInstallClass):
def setGroupSelection(self, anaconda):
BaseInstallClass.setGroupSelection(self, anaconda)
- map(lambda x: anaconda.backend.selectGroup(x), ["core"])
+ map(lambda x: anaconda.backend.selectGroup(x), ["base"])
def setSteps(self, anaconda):
BaseInstallClass.setSteps(self, anaconda)
diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml
index e5cd6cb..e69605f 100644
--- a/conf/comps-qubes.xml
+++ b/conf/comps-qubes.xml
@@ -4,832 +4,88 @@
base
Base
- This group includes a minimal set of packages. Useful for creating small router/firewall boxes, for example.
true
- false
at
authconfig
- bc
- bind-utils
bzip2
- crontabs
- cyrus-sasl-plain
+ cryptsetup-luks
dbus
+ device-mapper-multipath
+ dmraid
+ dump
ed
+ eject
+ gnupg2
+ irqbalance
logrotate
lsof
- mailcap
man
- NetworkManager
+ man-pages
+ mcelog
+ mdadm
+ microcode_ctl
+ mlocate
+ nano
ntsysv
+ numactl
parted
pciutils
- psacct
+ pcmciautils
+ perf
+ pinfo
+ pm-utils
+ prelink
+ qubes-release-notes
quota
+ readahead
+ smartmontools
+ sudo
+ symlinks
+ time
tmpwatch
- traceroute
- aspell-en
- hunspell-en
- acpid
- ccid
- coolkey
- cpuspeed
- cryptsetup-luks
- device-mapper-multipath
- dmraid
- dos2unix
- dosfstools
- dump
- eject
- finger
- fprintd-pam
- ftp
- gnupg2
- hunspell
- iptstate
- irda-utils
- irqbalance
- jwhois
- krb5-workstation
- lftp
- man-pages
- mcelog
- mdadm
- microcode_ctl
- mlocate
- mtr
- nano
- nc
- nfs-utils
- nss_db
- nss_ldap
- ntfs-3g
- ntfsprogs
- numactl
- openssh-clients
- pam_ccreds
- pam_krb5
- pam_passwdqc
- pam_pkcs11
- pam_smb
- pcmciautils
- perf
- pinfo
- pm-utils
- prctl
- prelink
- qubes-release-notes
- rdate
- rdist
- readahead
- rng-utils
- rsh
- rsync
- sendmail
- setuptool
- smartmontools
- sos
- specspo
- sssd
- stunnel
- sudo
- symlinks
- system-config-firewall-tui
- system-config-network-tui
- talk
- tcpdump
- tcp_wrappers
- telnet
- time
- tree
- unix2dos
- unzip
- usbutils
- vconfig
- wget
- which
- wireless-tools
- words
- ypbind
- yum-presto
- yum-utils
- zip
- apmd
- authd
- bridge-utils
- brltty
- btrfs-progs
- fbset
- gnupg2-smime
- gpart
- gpgme
- gpm
- hardlink
- hfsutils
- iscsi-initiator-utils
- jfsutils
- kexec-tools
- ksh
- logwatch
- mgetty
- mkbootdisk
- mtools
- pax
- redhat-lsb
- reiserfs-utils
- squashfs-tools
- star
- tcsh
- x86info
- xfsprogs
- yum-langpacks
- yum-updatesd
+ tree
+ unzip
+ usbutils
+ which
+ yum-presto
+ yum-utils
+ zip
base-x
X Window System
- Install this group of packages to use the base graphical (X) user interface.
true
- false
-
- xorg-x11-drivers
- xorg-x11-server-Xorg
- xorg-x11-xauth
- xorg-x11-xinit
- authconfig-gtk
- cups-pk-helper
- desktop-backgrounds-basic
- firstboot
- glx-utils
- gnome-packagekit
- krb5-auth-dialog
- openssh-askpass
- plymouth-system-theme
- system-config-date
- system-config-firewall
- system-config-network
- system-config-printer
- system-config-services
- system-config-users
- xorg-x11-utils
- alltray
- aterm
- bitmap-console-fonts
- bitmap-fangsongti-fonts
- bitmap-fixed-fonts
- bitmap-lucida-typewriter-fonts
- devilspie
- gdm
- gxmessage
- lilyterm
- lxpanel
- roxterm
- rss-glx
- rss-glx-xscreensaver
- rxvt
- sakura
- slim
- switchdesk
- system-config-display
- system-switch-displaymanager
- termit
- tigervnc-server
- ucs-miscfixed-fonts
- uim-gtk2
- workrave
- xclip
- xdaliclock
- xguest
- xkeycaps
- xlockmore
- xorg-x11-apps
- xorg-x11-resutils
- xorg-x11-server-Xnest
- xorg-x11-server-Xvfb
- xorg-x11-twm
- xorg-x11-xfs
- xorg-x11-xfs-utils
- xorg-x11-xsm
- xscreensaver
- xscreensaver-base
- xscreensaver-extras
- xscreensaver-gl-extras
- xterm
-
-
-
- core
- Core
- Smallest possible installation
- true
- false
-
- acl
- attr
- audit
- authconfig
- basesystem
- bash
- coreutils
- cpio
- cronie
- cronie-anacron
- dhclient
- e2fsprogs
- file
- filesystem
- glibc
- initscripts
- iproute
- iprutils
- iptables
- iptables-ipv6
- iputils
- kbd
- libgcc
- ncurses
- openssh-server
- passwd
- procps
- qubes-release
- readline
- rootfiles
- rpm
- rsyslog
- setserial
- setup
- shadow-utils
- sudo
- util-linux-ng
- vim-minimal
- yum
- efibootmgr
- grub
- ppc64-utils
- s390utils
- sendmail
- silo
- yaboot
-
-
-
- critical-path-base
- Critical Path (Base)
- A set of packages that provide the shared platform for Critical Path functionality on all Fedora spins
- false
- false
-
- anaconda
- createrepo
- dash
- dracut
- firstboot
- gcc-c++
- kernel
- livecd-tools
- mash
- NetworkManager
- pungi
- redhat-rpm-config
- rpm-build
- yum
-
-
-
- critical-path-gnome
- Critical Path (GNOME)
- A set of packages that provide the Critical Path functionality for the GNOME desktop
- false
- false
desktop-backgrounds-basic
- gdm
+ firstboot
+ glx-utils
xorg-x11-drivers
xorg-x11-server-Xorg
+ xorg-x11-utils
xorg-x11-xauth
xorg-x11-xinit
- notification-daemon
-
-
-
- fonts
- Fonts
- Fonts packages for rendering text on the desktop.
- true
- false
-
- dejavu-sans-fonts
- dejavu-sans-mono-fonts
- dejavu-serif-fonts
- jomolhari-fonts
- kacst-art-fonts
- kacst-book-fonts
- kacst-decorative-fonts
- kacst-digital-fonts
- kacst-farsi-fonts
- kacst-letter-fonts
- kacst-naskh-fonts
- kacst-office-fonts
- kacst-one-fonts
- kacst-pen-fonts
- kacst-poster-fonts
- kacst-qurn-fonts
- kacst-screen-fonts
- kacst-title-fonts
- kacst-titlel-fonts
- khmeros-base-fonts
- liberation-mono-fonts
- liberation-sans-fonts
- liberation-serif-fonts
- lklug-fonts
- lohit-assamese-fonts
- lohit-bengali-fonts
- lohit-devanagari-fonts
- lohit-gujarati-fonts
- lohit-kannada-fonts
- lohit-oriya-fonts
- lohit-punjabi-fonts
- lohit-tamil-fonts
- lohit-telugu-fonts
- padauk-fonts
- paktype-naqsh-fonts
- paktype-tehreer-fonts
- paratype-pt-sans-fonts
- sil-abyssinica-fonts
- smc-meera-fonts
- stix-fonts
- thai-scalable-waree-fonts
- un-core-dotum-fonts
- vlgothic-fonts
- wqy-zenhei-fonts
- adf-accanthis-2-fonts
- adf-accanthis-3-fonts
- adf-accanthis-fonts
- adf-tribun-fonts
- allgeyer-musiqwik-fonts
- allgeyer-musisync-fonts
- apa-new-athena-unicode-fonts
- apanov-edrip-fonts
- apanov-heuristica-fonts
- aplus-fsf-KAPL-fonts
- asana-math-fonts
- baekmuk-ttf-batang-fonts
- baekmuk-ttf-dotum-fonts
- baekmuk-ttf-gulim-fonts
- baekmuk-ttf-hline-fonts
- beteckna-fonts
- beteckna-lower-case-fonts
- beteckna-small-caps-fonts
- bitstream-vera-sans-fonts
- bitstream-vera-sans-mono-fonts
- bitstream-vera-serif-fonts
- bpg-algeti-fonts
- bpg-chveulebrivi-fonts
- bpg-courier-fonts
- bpg-courier-s-fonts
- bpg-elite-fonts
- bpg-excelsior-fonts
- bpg-glaho-fonts
- bpg-ingiri-fonts
- bpg-nino-medium-cond-fonts
- bpg-nino-medium-fonts
- bpg-sans-fonts
- bpg-sans-medium-fonts
- bpg-sans-modern-fonts
- bpg-sans-regular-fonts
- bpg-serif-fonts
- bpg-serif-modern-fonts
- brettfont-fonts
- cave9-mutante-fonts
- cf-bonveno-fonts
- chisholm-letterslaughing-fonts
- chisholm-to-be-continued-fonts
- cjkuni-ukai-fonts
- cjkuni-uming-fonts
- conakry-fonts
- ctan-cm-lgc-roman-fonts
- ctan-cm-lgc-sans-fonts
- ctan-cm-lgc-typewriter-fonts
- ctan-kerkis-calligraphic-fonts
- ctan-kerkis-sans-fonts
- ctan-kerkis-serif-fonts
- darkgarden-fonts
- dejavu-lgc-sans-fonts
- dejavu-lgc-sans-mono-fonts
- dejavu-lgc-serif-fonts
- denemo-music-fonts
- drehatlas-warender-bibliothek-fonts
- drehatlas-widelands-fonts
- drehatlas-xaporho-fonts
- dustin-domestic-manners-fonts
- dustin-dustismo-roman-fonts
- dustin-dustismo-sans-fonts
- ecolier-court-fonts
- ecolier-court-lignes-fonts
- extremetuxracer-papercuts-fonts
- extremetuxracer-papercuts-outline-fonts
- freecol-imperator-fonts
- freecol-shadowedblack-fonts
- gargi-fonts
- gdouros-aegean-fonts
- gdouros-aegyptus-fonts
- gdouros-akkadian-fonts
- gdouros-alexander-fonts
- gdouros-analecta-fonts
- gdouros-musica-fonts
- gfs-ambrosia-fonts
- gfs-artemisia-fonts
- gfs-baskerville-fonts
- gfs-bodoni-classic-fonts
- gfs-bodoni-fonts
- gfs-complutum-fonts
- gfs-decker-fonts
- gfs-didot-classic-fonts
- gfs-didot-fonts
- gfs-eustace-fonts
- gfs-fleischman-fonts
- gfs-garaldus-fonts
- gfs-gazis-fonts
- gfs-goschen-fonts
- gfs-ignacio-fonts
- gfs-jackson-fonts
- gfs-neohellenic-fonts
- gfs-nicefore-fonts
- gfs-olga-fonts
- gfs-philostratos-fonts
- gfs-porson-fonts
- gfs-pyrsos-fonts
- gfs-solomos-fonts
- gfs-theokritos-fonts
- gnu-free-mono-fonts
- gnu-free-sans-fonts
- gnu-free-serif-fonts
- google-droid-sans-fonts
- google-droid-sans-mono-fonts
- google-droid-serif-fonts
- hanazono-fonts
- hartke-aurulent-sans-fonts
- hartke-aurulent-sans-mono-fonts
- icelandic-fonts
- inkboy-fonts
- ipa-gothic-fonts
- ipa-mincho-fonts
- ipa-pgothic-fonts
- ipa-pmincho-fonts
- khmeros-battambang-fonts
- khmeros-bokor-fonts
- khmeros-handwritten-fonts
- khmeros-metal-chrieng-fonts
- khmeros-muol-fonts
- khmeros-siemreap-fonts
- kurdit-unikurd-web-fonts
- levien-inconsolata-fonts
- lilypond-aybabtu-fonts
- lilypond-century-schoolbook-l-fonts
- lilypond-emmentaler-fonts
- lilypond-feta-alphabet-fonts
- lilypond-feta-braces-fonts
- lilypond-feta-fonts
- lilypond-parmesan-fonts
- linux-libertine-fonts
- lohit-malayalam-fonts
- madan-fonts
- mathml-fonts
- mgopen-canonica-fonts
- mgopen-cosmetica-fonts
- mgopen-modata-fonts
- mgopen-moderna-fonts
- mscore-fonts
- msimonson-anonymouspro-fonts
- myanmar3-unicode-fonts
- nafees-web-naskh-fonts
- ns-bola-fonts
- ns-tiza-chalk-fonts
- oflb-goudy-bookletter-1911-fonts
- oflb-notcouriersans-fonts
- oflb-prociono-fonts
- oflb-riordonfancy-fonts
- oflb-smonohand-fonts
- oldstandard-sfd-fonts
- openoffice.org-opensymbol-fonts
- paratype-pt-sans-caption-fonts
- roadstencil-fonts
- saab-fonts
- samyak-devanagari-fonts
- samyak-gujarati-fonts
- samyak-malayalam-fonts
- samyak-oriya-fonts
- samyak-tamil-fonts
- sarai-fonts
- sazanami-gothic-fonts
- sazanami-mincho-fonts
- senamirmir-washra-fantuwua-fonts
- senamirmir-washra-fonts
- senamirmir-washra-hiwua-fonts
- senamirmir-washra-jiret-fonts
- senamirmir-washra-tint-fonts
- senamirmir-washra-wookianos-fonts
- senamirmir-washra-yebse-fonts
- senamirmir-washra-yigezu-bisrat-goffer-fonts
- senamirmir-washra-yigezu-bisrat-gothic-fonts
- senamirmir-washra-zelan-fonts
- serafettin-cartoon-fonts
- sil-andika-fonts
- sil-charis-compact-fonts
- sil-charis-fonts
- sil-doulos-fonts
- sil-gentium-alt-fonts
- sil-gentium-basic-book-fonts
- sil-gentium-basic-fonts
- sil-gentium-fonts
- sil-lateef-fonts
- sil-padauk-fonts
- sil-scheherazade-fonts
- silkscreen-expanded-fonts
- silkscreen-fonts
- sj-delphine-fonts
- sj-stevehand-fonts
- smc-anjalioldlipi-fonts
- smc-dyuthi-fonts
- smc-kalyani-fonts
- smc-rachana-fonts
- smc-raghumalayalam-fonts
- smc-suruma-fonts
- sportrop-fonts
- stix-integrals-fonts
- stix-pua-fonts
- stix-sizes-fonts
- stix-variants-fonts
- thibault-essays1743-fonts
- thibault-isabella-fonts
- thibault-rockets-fonts
- thibault-staypuft-fonts
- tibetan-machine-uni-fonts
- tiresias-info-fonts
- tiresias-info-z-fonts
- tiresias-key-v2-fonts
- tiresias-lp-fonts
- tiresias-pc-fonts
- tiresias-pc-z-fonts
- tiresias-sign-fonts
- tiresias-sign-z-fonts
- tulrich-tuffy-fonts
- un-core-batang-fonts
- un-core-dinaru-fonts
- un-core-graphic-fonts
- un-core-gungseo-fonts
- un-core-pilgi-fonts
- un-extra-fonts-bom
- un-extra-fonts-jamobatang
- un-extra-fonts-jamodotum
- un-extra-fonts-jamonovel
- un-extra-fonts-jamosora
- un-extra-fonts-pen
- un-extra-fonts-penheulim
- un-extra-fonts-pilgia
- un-extra-fonts-shinmun
- un-extra-fonts-taza
- un-extra-fonts-vada
- un-extra-fonts-yetgul
- vemana2000-fonts
- vlgothic-p-fonts
- vollkorn-fonts
- woodardworks-laconic-fonts
- woodardworks-laconic-shadow-fonts
- wqy-microhei-fonts
- xorg-x11-fonts-ethiopic
- yanone-kaffeesatz-fonts
- yanone-tagesschrift-fonts
-
-
-
- hardware-support
- Hardware Support
- This group is a collection of tools for various hardware specific utilities.
- true
- true
-
- ar9170-firmware
- atmel-firmware
- b43-fwcutter
- b43-openfwwf
- ipw2100-firmware
- ipw2200-firmware
- ivtv-firmware
- iwl1000-firmware
- iwl3945-firmware
- iwl4965-firmware
- iwl5000-firmware
- iwl5150-firmware
- iwl6000-firmware
- libertas-usb8388-firmware
- printer-filters
- ql2100-firmware
- ql2200-firmware
- ql23xx-firmware
- ql2400-firmware
- ql2500-firmware
- rt61pci-firmware
- rt73usb-firmware
- zd1211-firmware
- acpi
- acpitool
- cmospwd
- ctapi-cyberjack
- ctapi-cyberjack-pcsc
- ctapi-cyberjack-tools
- firmware-addon-dell
- gpsd
- gpsd-clients
- gypsy
- hddtemp
- hdparm
- i8kutils
- iscan-firmware
- isight-firmware-tools
- libifp
- lsscsi
- multican
- openct
- opensc
- s3switch
- tpb
kde-desktop
KDE Software Compilation
- The KDE SC includes the KDE Plasma Desktop, a highly-configurable graphical user interface which includes a panel, desktop, system icons and desktop widgets, and many powerful KDE applications.
true
- false
+ kcm_touchpad
+ kdeaccessibility
+ kdm
+ oxygen-icons-theme
qubes-kde-dom0
- gstreamer-plugins-good
- ibus-qt
- scim-bridge-qt
- cups-pk-helper
- dejavu-sans-fonts
- dejavu-sans-mono-fonts
- dejavu-serif-fonts
- kcm-gtk
- kcm_touchpad
- kdeaccessibility
- kdeartwork-screensavers
- kdm
- kftpgrabber
- phonon-backend-gstreamer
- phonon-backend-xine
- pinentry-qt4
- xsettings-kde
- basket
- bespin
- bilbo
- compiz-kde
- crystal
- kbibtex
- kbilliards
- kchmviewer
- kcoloredit
- kcometen4
- kdissert
- kerry
- kgrab
- kiconedit
- kio-ftps
- kiosktool
- kio_gopher
- klamav
- kmenu-gnome
- kmid
- kmymoney2
- knemo
- kobby
- koffice-suite
- koverartist
- krecipes
- krename
- krusader
- ksensors
- kshutdown
- ksig
- kvirc
- leonidas-kde-theme-landscape
- leonidas-kde-theme-lion
- metamonitor
- oooqs2
- polyester
- qt-recordmydesktop
- rekall
- rsibreak
- rss-glx-kde
- scim-bridge-qt3
- skanlite
- smb4k
- speedcrunch
- transmission-qt
- uim-qt3
- yakuake
-
-
-
- legacy-fonts
- Legacy Fonts
- Older bitmap and vector fonts packages
- false
- true
-
- xorg-x11-fonts-100dpi
- xorg-x11-fonts-ISO8859-15-100dpi
- xorg-x11-fonts-misc
- xorg-x11-fonts-Type1
- artwiz-aleczapka-fonts
- baekmuk-bdf-fonts
- bitmap-console-fonts
- bitmap-fangsongti-fonts
- bitmap-fixed-fonts
- bitmap-lucida-typewriter-fonts
- ctan-musixtex-fonts
- culmus-aharoni-clm-fonts
- culmus-caladings-clm-fonts
- culmus-david-clm-fonts
- culmus-drugulin-clm-fonts
- culmus-ellinia-clm-fonts
- culmus-frank-ruehl-clm-fonts
- culmus-miriam-clm-fonts
- culmus-miriam-mono-clm-fonts
- culmus-nachlieli-clm-fonts
- culmus-yehuda-clm-fonts
- efont-unicode-bdf
- fonts-hebrew-fancy
- fonts-ISO8859-2
- fonts-ISO8859-2-100dpi
- fonts-ISO8859-2-75dpi
- fonts-KOI8-R
- fonts-KOI8-R-100dpi
- fonts-KOI8-R-75dpi
- ghostscript-fonts
- japanese-bitmap-fonts
- jisksp16-1990-fonts
- knm-new-fixed-fonts
- libdockapp-fonts
- lyx-cmex10-fonts
- lyx-cmmi10-fonts
- lyx-cmr10-fonts
- lyx-cmsy10-fonts
- lyx-esint10-fonts
- lyx-eufm10-fonts
- lyx-msam10-fonts
- lyx-msbm10-fonts
- lyx-wasy10-fonts
- mona-bitmap-fonts
- nethack-bitmap-fonts
- nted-ntedfont-fonts
- oflb-dignas-handwriting-fonts
- rosegarden4-feta-fonts
- rosegarden4-parmesan-fonts
- taipeifonts
- terminus-fonts
- terminus-fonts-console
- ucs-miscfixed-fonts
- urw-fonts
- wqy-bitmap-fonts
- wqy-unibit-fonts
- xorg-x11-fonts-75dpi
- xorg-x11-fonts-cyrillic
- xorg-x11-fonts-ethiopic
- xorg-x11-fonts-ISO8859-1-100dpi
- xorg-x11-fonts-ISO8859-1-75dpi
- xorg-x11-fonts-ISO8859-14-100dpi
- xorg-x11-fonts-ISO8859-14-75dpi
- xorg-x11-fonts-ISO8859-15-75dpi
- xorg-x11-fonts-ISO8859-2-100dpi
- xorg-x11-fonts-ISO8859-2-75dpi
- xorg-x11-fonts-ISO8859-9-100dpi
- xorg-x11-fonts-ISO8859-9-75dpi
- zvbi-fonts
-
-
-
- legacy-software-support
- Legacy Software Support
-
- false
- false
-
- compat-libgcc-296
- compat-libstdc++-296
- compat-libstdc++-33
- compat-db
+ redhat-menus
+ xsettings-kde
qubes
Qubes Environment
-
true
- true
kernel-qubes-dom0
qubes-core-dom0
diff --git a/conf/qubes-kickstart.cfg b/conf/qubes-kickstart.cfg
index 645fad3..56eae15 100644
--- a/conf/qubes-kickstart.cfg
+++ b/conf/qubes-kickstart.cfg
@@ -3,48 +3,17 @@
# Package manifest for the compose. Uses repo group metadata to translate groups.
# (@base is added by default unless you add --nobase to %packages)
# (default groups for the configured repos are added by --default)
-#%packages --default
%packages
-# core
-tcsh
-dracut-*
-# X and drivers
-@base-x
-@fonts
-# Desktop Packages
-@kde-desktop --nodefaults
+@base-x --nodefaults
+@fonts --nodefaults
+@kde-desktop
-kde*
-oxygen-icon-theme
-# Qubes Spin
-kernel-qubes-dom0
qubes-kde-dom0
+@qubes
+kernel-qubes-dom0
qubes-core-dom0
qubes-gui-dom0
qubes-manager
qubes-template-fedora-14-x64
--smolt-firstboot
--smolt
-# Keep dap off the install media, makes Eng & Sci show up
--dap-server-cgi
-# filesystem stuff
@filesystems
-# Size removals
--gimp-help
--java-1.6.0-openjdk-src
--xorg-x11-docs
--kernel-doc
--java-1.5.0-gcj-src
--java-1.5.0-gcj-devel
--libgcj-src
--*javadoc*
--frysk
--*gcj*
--akonadi
--kdepimlibs*
--boost-*
--enblend
--hugin-base
--report*
--wxBase
--wxGTK*
%end