This patch goes with the node patch just sent, and is ready for pushing upstream. I'll be doing the blacklisting in a later patch once this is upstream.
Darryl L. Pierce
2009-Sep-16 12:35 UTC
[Ovirt-devel] [PATCH node-image] Changed packages and dependencies so virt-manager-tui runs properly.
Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
common-blacklist.ks | 4 ++--
common-install.ks | 2 +-
common-pkgs.ks | 2 ++
common-post.ks | 7 +++++++
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/common-blacklist.ks b/common-blacklist.ks
index 2f8842f..4c196e5 100644
--- a/common-blacklist.ks
+++ b/common-blacklist.ks
@@ -8,14 +8,14 @@ echo "Removing excess RPMs"
# However, this is just an install-time dependency; we can remove
# it afterwards, which we do here
RPMS="system-config-firewall-tui system-config-network-tui rhpl \
- rpm-python dbus-python kudzu newt-python newt libsemanage-python"
+ rpm-python kudzu libsemanage-python"
RPMS="$RPMS kpartx mkinitrd isomd5sum dmraid checkpolicy"
# Remove additional RPMs forcefully
RPMS="$RPMS gamin pm-utils kbd usermode vbetool ConsoleKit hdparm \
efibootmgr linux-atm-libs fedora-release-notes \
- slang psmisc cryptsetup-luks pciutils mtools syslinux \
+ psmisc cryptsetup-luks pciutils mtools syslinux \
wireless-tools radeontool libicu gnupg2 \
fedora-logos"
diff --git a/common-install.ks b/common-install.ks
index 2a7fbb7..9bcdaa3 100644
--- a/common-install.ks
+++ b/common-install.ks
@@ -4,7 +4,7 @@ timezone --utc UTC
auth --useshadow --enablemd5
selinux --enforcing
firewall --disabled
-part / --size 600 --fstype ext2
+part / --size 650 --fstype ext2
services
--enabled=auditd,ntpd,ntpdate,collectd,iptables,network,rsyslog,libvirt-qpid
# This requires a new fixed version of livecd-creator to honor the --append
settings.
bootloader --timeout=30 --append="console=tty0
console=ttyS0,115200n8"
diff --git a/common-pkgs.ks b/common-pkgs.ks
index 6f0af6e..094e9cb 100644
--- a/common-pkgs.ks
+++ b/common-pkgs.ks
@@ -20,6 +20,7 @@ vim-minimal
sudo
python
python-libs
+python-setuptools
db4
vconfig
python-virtinst
@@ -37,6 +38,7 @@ pciutils
numactl
file
lsof
+newt-python
/usr/bin/kvmtrace
#remove
-audit-libs-python
diff --git a/common-post.ks b/common-post.ks
index 0c0a3f4..d0a52e9 100644
--- a/common-post.ks
+++ b/common-post.ks
@@ -146,3 +146,10 @@ EOF
# Remove the default logrotate daily cron job
# since we run it every 10 minutes instead.
rm -f /etc/cron.daily/logrotate
+
+# add nodeadmin as a valid shell
+cat >> /etc/shells <<EOF
+/usr/bin/nodeadmin
+EOF
+
+chsh -s /usr/bin/nodeadmin root
--
1.6.2.5