From 540b555551137715ebe712699f3fae3e90a9de00 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Tue, 17 Jun 2008 16:15:19 +0000 Subject: [PATCH] Fedora 9 support. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2719 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- distrib/Makefile.am | 2 + distrib/f9/pkgs/01 | 1 + distrib/f9/pkgs/02 | 3 ++ distrib/f9/pkgs/03 | 2 + distrib/f9/rpmlist.d/00.lst | 25 +++++++++++ distrib/f9/yum.repos.d/fedora-development.repo | 48 ++++++++++++++++++++++ distrib/f9/yum.repos.d/fedora-updates-testing.repo | 26 ++++++++++++ distrib/f9/yum.repos.d/fedora-updates.repo | 26 ++++++++++++ distrib/f9/yum.repos.d/fedora.repo | 26 ++++++++++++ distrib/f9/yum/yum.conf | 11 +++++ distrib/redhat/initctl | 8 ++++ distrib/redhat/initpost | 8 ++++ 12 files changed, 186 insertions(+) create mode 100644 distrib/f9/pkgs/01 create mode 100644 distrib/f9/pkgs/02 create mode 100644 distrib/f9/pkgs/03 create mode 100644 distrib/f9/rpmlist.d/00.lst create mode 100644 distrib/f9/yum.repos.d/fedora-development.repo create mode 100644 distrib/f9/yum.repos.d/fedora-updates-testing.repo create mode 100644 distrib/f9/yum.repos.d/fedora-updates.repo create mode 100644 distrib/f9/yum.repos.d/fedora.repo create mode 100644 distrib/f9/yum/yum.conf create mode 100644 distrib/redhat/initctl diff --git a/distrib/Makefile.am b/distrib/Makefile.am index 8ce57e7..ff365c7 100644 --- a/distrib/Makefile.am +++ b/distrib/Makefile.am @@ -66,6 +66,8 @@ nobase_distrib_DATA = defaults/devs \ f8/apt/rpmpriorities f8/pkgs/01 f8/pkgs/02 f8/pkgs/03 \ f8/yum/yum.conf $(wildcard f8/yum.repos.d/*.repo) \ $(wildcard f8/rpmlist.d/*.lst) $(wildcard f8/rpmlist.d/*.opt) \ + f9/pkgs/01 f9/pkgs/02 f9/pkgs/03 f9/yum/yum.conf \ + $(wildcard f9/rpmlist.d/*.lst) $(wildcard f9/rpmlist.d/*.opt) \ centos4/pkgs/01 centos4/pkgs/02 centos4/pkgs/03 \ centos4/yum/yum.conf $(wildcard centos4/yum.repos.d/*.repo) \ centos5/pkgs/01 centos5/pkgs/02 centos5/pkgs/03 \ diff --git a/distrib/f9/pkgs/01 b/distrib/f9/pkgs/01 new file mode 100644 index 0000000..1a5ef72 --- /dev/null +++ b/distrib/f9/pkgs/01 @@ -0,0 +1 @@ +glibc diff --git a/distrib/f9/pkgs/02 b/distrib/f9/pkgs/02 new file mode 100644 index 0000000..9ec5d2b --- /dev/null +++ b/distrib/f9/pkgs/02 @@ -0,0 +1,3 @@ +--reinstall + +filesystem diff --git a/distrib/f9/pkgs/03 b/distrib/f9/pkgs/03 new file mode 100644 index 0000000..218b1e6 --- /dev/null +++ b/distrib/f9/pkgs/03 @@ -0,0 +1,2 @@ +coreutils +initscripts diff --git a/distrib/f9/rpmlist.d/00.lst b/distrib/f9/rpmlist.d/00.lst new file mode 100644 index 0000000..44d59c2 --- /dev/null +++ b/distrib/f9/rpmlist.d/00.lst @@ -0,0 +1,25 @@ +basesystem-*.rpm +filesystem-*.rpm +glibc-common-*.rpm +glibc-[0-9]*.rpm +libgcc-[0-9]*.rpm +setup-*.rpm +tzdata-*.rpm +bash-[0-9]*.rpm +ncurses-libs-*.rpm +ncurses-[0-9]*.rpm +coreutils-[0-9]*.rpm +ncurses-base-[0-9]*.rpm +pam-[0-9]*.rpm +libselinux-[0-9]*.rpm +grep-[0-9]*.rpm +info-[0-9]*.rpm +libacl-[0-9]*.rpm +cracklib-[0-9]*.rpm +cracklib-dicts-[0-9]*.rpm +audit-libs-[0-9]*.rpm +libsepol-[0-9]*.rpm +zlib-[0-9]*.rpm +pcre-[0-9]*.rpm +libattr-[0-9]*.rpm +libstdc++-[0-9]*.rpm diff --git a/distrib/f9/yum.repos.d/fedora-development.repo b/distrib/f9/yum.repos.d/fedora-development.repo new file mode 100644 index 0000000..fb6fe26 --- /dev/null +++ b/distrib/f9/yum.repos.d/fedora-development.repo @@ -0,0 +1,48 @@ +# These packages are untested and still under development. This +# repository is used for updates to test releases, and for +# development of new releases. +# +# This repository can see significant daily turnover and major +# functionality changes which cause unexpected problems with other +# development packages. Please use these packages if you want to work +# with the Fedora developers by testing these new development packages. +# +# fedora-test-list@redhat.com is available as a discussion forum for +# testing and troubleshooting for development packages in conjunction +# with new test releases. +# +# More information is available at http://fedoraproject.org/wiki/Testing +# +# Reproducible and reportable issues should be filed at +# http://bugzilla.redhat.com/. +# +# Product: Fedora +# Version: devel + +[development] +name=Fedora - Development +failovermethod=priority +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/$basearch/os/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch +enabled=0 +gpgcheck=0 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY-fedora-test http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY-fedora + +[development-debuginfo] +name=Fedora - Development - Debug +failovermethod=priority +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/$basearch/debug/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-debug&arch=$basearch +enabled=0 +gpgcheck=0 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY-fedora-test http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY-fedora + +[development-source] +name=Fedora - Development - Source +failovermethod=priority +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch +enabled=0 +gpgcheck=0 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY-fedora-test http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY-fedora + diff --git a/distrib/f9/yum.repos.d/fedora-updates-testing.repo b/distrib/f9/yum.repos.d/fedora-updates-testing.repo new file mode 100644 index 0000000..1524446 --- /dev/null +++ b/distrib/f9/yum.repos.d/fedora-updates-testing.repo @@ -0,0 +1,26 @@ +[updates-testing] +name=Fedora 9 - $basearch - Test Updates +failovermethod=priority +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/9/$basearch/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f9&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY-fedora-test + +[updates-testing-debuginfo] +name=Fedora 9 - $basearch - Test Updates Debug +failovermethod=priority +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/9/$basearch/debug/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f9&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY-fedora-test + +[updates-testing-source] +name=Fedora 9 - Test Updates Source +failovermethod=priority +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/9/SRPMS/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f9&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY-fedora-test diff --git a/distrib/f9/yum.repos.d/fedora-updates.repo b/distrib/f9/yum.repos.d/fedora-updates.repo new file mode 100644 index 0000000..41089af --- /dev/null +++ b/distrib/f9/yum.repos.d/fedora-updates.repo @@ -0,0 +1,26 @@ +[updates] +name=Fedora 9 - $basearch - Updates +failovermethod=priority +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/9/$basearch/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch +enabled=1 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY-fedora + +[updates-debuginfo] +name=Fedora 9 - $basearch - Updates - Debug +failovermethod=priority +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/9/$basearch/debug/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f9&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY-fedora + +[updates-source] +name=Fedora 9 - Updates Source +failovermethod=priority +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/9/SRPMS/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f9&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY-fedora diff --git a/distrib/f9/yum.repos.d/fedora.repo b/distrib/f9/yum.repos.d/fedora.repo new file mode 100644 index 0000000..536fcc1 --- /dev/null +++ b/distrib/f9/yum.repos.d/fedora.repo @@ -0,0 +1,26 @@ +[fedora] +name=Fedora 9 - $basearch +failovermethod=priority +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/9/Everything/$basearch/os/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch +enabled=1 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY-fedora http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY + +[fedora-debuginfo] +name=Fedora 9 - $basearch - Debug +failovermethod=priority +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/9/Everything/$basearch/debug/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-9&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY-fedora http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY + +[fedora-source] +name=Fedora 9 - Source +failovermethod=priority +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/9/Everything/source/SRPMS/ +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-9&arch=$basearch +enabled=0 +gpgcheck=1 +gpgkey=http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY-fedora http://redhat.download.fedoraproject.org/pub/fedora/linux/releases/9/Fedora/$basearch/os/RPM-GPG-KEY diff --git a/distrib/f9/yum/yum.conf b/distrib/f9/yum/yum.conf new file mode 100644 index 0000000..cd0ccc9 --- /dev/null +++ b/distrib/f9/yum/yum.conf @@ -0,0 +1,11 @@ +[main] +cachedir=@YUMCACHEDIR@ +persistdir=@YUMLIBDIR@ +reposdir=@YUMETCDIR@/yum.repos.d +debuglevel=1 +logfile=@YUMLOGDIR@/log +lockfile=@YUMLOCKDIR@/yum.pid +pkgpolicy=newest +distroverpkg=fedora-release +installonlypkgs= +exactarch=0 diff --git a/distrib/redhat/initctl b/distrib/redhat/initctl new file mode 100644 index 0000000..2ce90d5 --- /dev/null +++ b/distrib/redhat/initctl @@ -0,0 +1,8 @@ +#!/bin/sh + +if kill -s 0 -- 1 > /dev/null 2>&1; then + exec /sbin/initctl "$@" +else + # Ignore... + exit 0 +fi diff --git a/distrib/redhat/initpost b/distrib/redhat/initpost index 5337fe0..48d5e97 100755 --- a/distrib/redhat/initpost +++ b/distrib/redhat/initpost @@ -89,6 +89,14 @@ EOF $_CHROOT_SH chmod 0755 /etc/rc.d/rc.sysinit.vserver subst etc/inittab 's!^\([^#].*:respawn:.* tty\)!#\1!; s!si::sysinit:/etc/rc.d/rc.sysinit!si::sysinit:/etc/rc.d/rc.sysinit.vserver!' + + if $_CHROOT_SH testfile /sbin/initctl; then + cat "$__DISTRIBDIR"/redhat/initctl | $_CHROOT_SH truncate /sbin/initctl.vserver + $_CHROOT_SH chmod 0755 /sbin/initctl.vserver + subst etc/rc.d/rc 's!^\(.*\)/proc/cmdline\(.*\)$!\1/proc/cmdline 2>/dev/null \2!;s!/sbin/initctl!/sbin/initctl.vserver!' + subst etc/event.d/rcS 's!/etc/rc.d/rc.sysinit!/etc/rc.d/rc.sysinit.vserver!' + $_CHROOT_SH rm /etc/event.d/tty{1,2,3,4,5,6} + fi popd >/dev/null stopSleepingGuest "$vserver" &> /dev/null || : -- 1.8.1.5