diff options
| author | David Lehman <dlehman@redhat.com> | 2009-03-04 20:45:57 -0600 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2009-03-04 20:45:57 -0600 |
| commit | db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3 (patch) | |
| tree | 0279b0573115d6d79f5b4c1892fdd55cb5f7f41b /scripts/upd-instroot | |
| parent | 78b1415591a1db738d0c09b9de50e501e2048c28 (diff) | |
| parent | 270003cd1f0c09a77608c4b0a07687c822f56274 (diff) | |
| download | anaconda-db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3.tar.gz anaconda-db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3.tar.xz anaconda-db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3.zip | |
Merge branch 'master' into storage
Conflicts:
anaconda
fsset.py
iutil.py
iw/partition_gui.py
partedUtils.py
Diffstat (limited to 'scripts/upd-instroot')
| -rwxr-xr-x | scripts/upd-instroot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/upd-instroot b/scripts/upd-instroot index b7dfca23f..1da86f508 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -183,8 +183,8 @@ PACKAGES="GConf2 NetworkManager ORBit2 PolicyKit acl anaconda reiserfs-utils rhpl rpm rpm-libs rpm-python sed selinux-policy-targeted setup slang smc-fonts-meera specspo sqlite synaptics system-config-date system-config-keyboard ${brandpkgname}-logos ${brandpkgname}-release taipeifonts tcp_wrappers - tzdata udev un-core-fonts-dotum urw-fonts util-linux-ng tightvnc-server - tightvnc-server-module vlgothic-fonts + tzdata udev un-core-fonts-dotum urw-fonts util-linux-ng tigervnc-server + tigervnc-server-module vlgothic-fonts wpa_supplicant xkeyboard-config xfsdump xfsprogs xorg-x11 xorg-x11-auth xorg-x11-base xorg-x11-drivers xorg-x11-font-utils xorg-x11-fonts-ethiopic xorg-x11-fonts-misc xorg-x11-libs xorg-x11-libs-data xorg-x11-server-utils @@ -512,7 +512,7 @@ usr/lib/python?.?/site-packages/yum usr/lib/rpm/macros usr/lib/rpm/rpmpopt usr/lib/rpm/rpmrc -usr/lib/syslinux +usr/share/syslinux usr/lib/yaboot usr/lib/yum-plugins/blacklist.py* usr/lib/yum-plugins/fedorakmod.py* |