diff options
| author | Ján ONDREJ <ondrejj@salstar.sk> | 2008-06-04 06:38:02 +0000 |
|---|---|---|
| committer | Ján ONDREJ <ondrejj@salstar.sk> | 2008-06-04 06:38:02 +0000 |
| commit | 96d7f3e7e678a8ac9919ce628c2f792d4cb57955 (patch) | |
| tree | 71d6ba7f9e48f87f90a8f8d5c8937c229913d6c5 /scripts | |
| parent | e772036e9972589c7808428c9fd00b90b2089a66 (diff) | |
| download | anaconda-96d7f3e7e678a8ac9919ce628c2f792d4cb57955.tar.gz anaconda-96d7f3e7e678a8ac9919ce628c2f792d4cb57955.tar.xz anaconda-96d7f3e7e678a8ac9919ce628c2f792d4cb57955.zip | |
2008-06-04 Ján ONDREJ <ondrejj@salstar.sk> (via ondrejj@fedoraproject.org)
* po/sk.po: Typo fix.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/buildinstall | 20 | ||||
| -rw-r--r-- | scripts/getlangnames.py | 6 | ||||
| -rwxr-xr-x | scripts/mk-images | 3 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 7 |
4 files changed, 30 insertions, 6 deletions
diff --git a/scripts/buildinstall b/scripts/buildinstall index a5001a9c5..4266d8301 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -69,7 +69,11 @@ while [ $# -gt 0 ]; do ;; *) + if [ -z "$REPO" ]; then REPO=$1 + else + EXTRA_REPOS="$EXTRA_REPOS $1" + fi shift ;; esac @@ -123,6 +127,22 @@ baseurl=$REPO enabled=1 EOF +n=1 +for r in $EXTRA_REPOS; do + if [[ $r =~ ^/ ]]; then + r="file://$r" + fi + cat >> $yumconf <<EOF + +[anaconda-extrarepo-$n] +name=anaconda extra repo $n +baseurl=$r +enabled=1 +EOF + let n++ +done + + BUILDINSTDIR=`mktemp -d ${TMPDIR:-/tmp}/buildinstall.tree.XXXXXX` TREEDIR=`mktemp -d ${TMPDIR:-/tmp}/treedir.XXXXXX` diff --git a/scripts/getlangnames.py b/scripts/getlangnames.py index c6fc61be6..921c86802 100644 --- a/scripts/getlangnames.py +++ b/scripts/getlangnames.py @@ -19,11 +19,11 @@ import sys sys.path.append("..") -from rhpl.translate import _ -import rhpl.translate import language -rhpl.translate.cat.setunicode(1) +from constants import * +import gettext +_ = lambda x: gettext.ldgettext("anaconda", x) langs = language.Language() names = {} diff --git a/scripts/mk-images b/scripts/mk-images index f522add7a..719a5b3b1 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -110,7 +110,8 @@ LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror dm-multipath dm-round-robin dm-emc RAIDMODS="md raid0 raid1 raid5 raid6 raid456 raid10 linear" CRYPTOMODS="sha256_generic cbc aes_generic blkcipher crc32c" PCMCIASOCKMODS="yenta_socket i82365 tcic pcmcia" -INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS =scsi =net" +DRMMODS="drm i810 i830 i915 mga nouveau r128 radeon savage sis tdfx via" +INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS $DRMMODS =scsi =net" . $(dirname $0)/buildinstall.functions diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 5b8a661e3..bf53e2c61 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -165,7 +165,7 @@ PACKAGES="glibc-common setup python newt slang libselinux device-mapper device-mapper-libs dmraid keyutils-libs libsemanage-python python-pyblock mkinitrd libbdevid libbdevid-python nss nspr pcre cryptsetup-luks libgcrypt libgpg-error dbus dbus-python hal - cracklib-python module-init-tools cracklib-dicts" + cracklib-python module-init-tools cracklib-dicts system-release" if [ $ARCH = i386 ]; then PACKAGES="$PACKAGES glibc.i386 openssl.i386" @@ -329,6 +329,7 @@ etc/selinux/targeted etc/shells etc/udev etc/yum/pluginconf.d/fedorakmod.conf +etc/yum.repos.d/* lib/terminfo $LIBDIR/libnss_dns* $LIBDIR/libnss_files* @@ -359,6 +360,7 @@ sbin/hdparm sbin/hwclock sbin/jfs_tune sbin/ldconfig +sbin/lspci sbin/lvm* sbin/mdadm sbin/mkdosfs @@ -611,6 +613,7 @@ usr/share/X11/locale usr/share/X11/rgb* usr/share/X11/xkb usr/$LIBDIR/xserver/SecurityPolicy +usr/$LIBDIR/dri usr/$LIBDIR/xorg/modules usr/bin/chattr* usr/bin/gdialog @@ -762,6 +765,7 @@ bin/tar bin/zcat etc/joe sbin/arp +sbin/blkid sbin/depmod sbin/dmraid sbin/dmsetup @@ -769,7 +773,6 @@ sbin/dump sbin/ifconfig sbin/insmod sbin/lsmod -sbin/lspci sbin/modinfo sbin/modprobe sbin/netstat |