Add f12 and f13.
authorDaniel Hokka Zakrisson <daniel@hozac.com>
Sun, 22 Aug 2010 18:31:41 +0000 (18:31 +0000)
committerDaniel Hokka Zakrisson <daniel@hozac.com>
Sun, 22 Aug 2010 18:31:41 +0000 (18:31 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2913 94cd875c-1c1d-0410-91d2-eb244daf1a30

18 files changed:
distrib/Makefile.am
distrib/f12/pkgs/01 [new file with mode: 0644]
distrib/f12/pkgs/02 [new file with mode: 0644]
distrib/f12/pkgs/03 [new file with mode: 0644]
distrib/f12/rpmlist.d/00.lst [new file with mode: 0644]
distrib/f12/yum.repos.d/fedora-updates-testing.repo [new file with mode: 0644]
distrib/f12/yum.repos.d/fedora-updates.repo [new file with mode: 0644]
distrib/f12/yum.repos.d/fedora.repo [new file with mode: 0644]
distrib/f12/yum/yum.conf [new file with mode: 0644]
distrib/f13/pkgs/01 [new file with mode: 0644]
distrib/f13/pkgs/02 [new file with mode: 0644]
distrib/f13/pkgs/03 [new file with mode: 0644]
distrib/f13/rpmlist.d/00.lst [new file with mode: 0644]
distrib/f13/yum.repos.d/fedora-updates-testing.repo [new file with mode: 0644]
distrib/f13/yum.repos.d/fedora-updates.repo [new file with mode: 0644]
distrib/f13/yum.repos.d/fedora.repo [new file with mode: 0644]
distrib/f13/yum/yum.conf [new file with mode: 0644]
gentoo/util-vserver

index ddd8bbb..646865a 100644 (file)
@@ -78,6 +78,12 @@ nobase_distrib_DATA  =  defaults/devs \
                           f11/pkgs/01 f11/pkgs/02 f11/pkgs/03 f11/yum/yum.conf \
                           $(wildcard $(srcdir)/f11/yum.repos.d/*.repo) \
                           $(wildcard $(srcdir)/f11/rpmlist.d/*.lst) $(wildcard $(srcdir)/f11/rpmlist.d/*.opt) \
+                          f12/pkgs/01 f12/pkgs/02 f12/pkgs/03 f12/yum/yum.conf \
+                          $(wildcard $(srcdir)/f12/yum.repos.d/*.repo) \
+                          $(wildcard $(srcdir)/f12/rpmlist.d/*.lst) $(wildcard $(srcdir)/f12/rpmlist.d/*.opt) \
+                          f13/pkgs/01 f13/pkgs/02 f13/pkgs/03 f13/yum/yum.conf \
+                          $(wildcard $(srcdir)/f13/yum.repos.d/*.repo) \
+                          $(wildcard $(srcdir)/f13/rpmlist.d/*.lst) $(wildcard $(srcdir)/f13/rpmlist.d/*.opt) \
                           centos4/pkgs/01 centos4/pkgs/02 centos4/pkgs/03 \
                           centos4/yum/yum.conf $(wildcard $(srcdir)/centos4/yum.repos.d/*.repo) \
                           centos5/pkgs/01 centos5/pkgs/02 centos5/pkgs/03 \
@@ -105,7 +111,7 @@ EXTRA_DIST          =  $(nobase_distrib_DATA) \
                           $(nobase_confdistrib_DATA) \
                           $(defaults_DATA)
 
-redhat_style           =  rh9 fc1 fc2 fc3 fc4 fc5 fc6 f7 f8 f9 f10 f11 centos4 centos5
+redhat_style           =  rh9 fc1 fc2 fc3 fc4 fc5 fc6 f7 f8 f9 f10 f11 f12 f13 centos4 centos5
 sid_style              =  etch lenny squeeze sid
 
 install-exec-hook:     install-notify-xtra
diff --git a/distrib/f12/pkgs/01 b/distrib/f12/pkgs/01
new file mode 100644 (file)
index 0000000..1a5ef72
--- /dev/null
@@ -0,0 +1 @@
+glibc
diff --git a/distrib/f12/pkgs/02 b/distrib/f12/pkgs/02
new file mode 100644 (file)
index 0000000..9ec5d2b
--- /dev/null
@@ -0,0 +1,3 @@
+--reinstall
+
+filesystem
diff --git a/distrib/f12/pkgs/03 b/distrib/f12/pkgs/03
new file mode 100644 (file)
index 0000000..218b1e6
--- /dev/null
@@ -0,0 +1,2 @@
+coreutils
+initscripts
diff --git a/distrib/f12/rpmlist.d/00.lst b/distrib/f12/rpmlist.d/00.lst
new file mode 100644 (file)
index 0000000..c825733
--- /dev/null
@@ -0,0 +1,11 @@
+glibc-[0-9]*.rpm
+basesystem-*.rpm
+bash-[0-9]*.rpm
+filesystem-*.rpm
+glibc-common-*.rpm
+libgcc-[0-9]*.rpm
+ncurses-base-[0-9]*.rpm
+ncurses-libs-*.rpm
+nss-softokn-freebl-*.rpm
+setup-*.rpm
+tzdata-*.rpm
diff --git a/distrib/f12/yum.repos.d/fedora-updates-testing.repo b/distrib/f12/yum.repos.d/fedora-updates-testing.repo
new file mode 100644 (file)
index 0000000..fcaf034
--- /dev/null
@@ -0,0 +1,26 @@
+[updates-testing]
+name=Fedora 12 - $basearch - Test Updates
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/12/$basearch/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f12&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/12/Everything/$basearch/os/RPM-GPG-KEY-fedora-test-$basearch
+
+[updates-testing-debuginfo]
+name=Fedora 12 - $basearch - Test Updates Debug
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/12/$basearch/debug/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f12&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/12/Everything/$basearch/os/RPM-GPG-KEY-fedora-test-$basearch
+
+[updates-testing-source]
+name=Fedora 12 - Test Updates Source
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/12/SRPMS/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f12&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/12/Everything/$basearch/os/RPM-GPG-KEY-fedora-test-$basearch
diff --git a/distrib/f12/yum.repos.d/fedora-updates.repo b/distrib/f12/yum.repos.d/fedora-updates.repo
new file mode 100644 (file)
index 0000000..4b2e1d1
--- /dev/null
@@ -0,0 +1,26 @@
+[updates]
+name=Fedora 12 - $basearch - Updates
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/12/$basearch/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f12&arch=$basearch
+enabled=1
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/12/Everything/$basearch/os/RPM-GPG-KEY-fedora-$basearch
+
+[updates-debuginfo]
+name=Fedora 12 - $basearch - Updates - Debug
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/12/$basearch/debug/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f12&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/12/Everything/$basearch/os/RPM-GPG-KEY-fedora-$basearch
+
+[updates-source]
+name=Fedora 12 - Updates Source
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/12/SRPMS/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f12&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/12/Everything/$basearch/os/RPM-GPG-KEY-fedora-$basearch
diff --git a/distrib/f12/yum.repos.d/fedora.repo b/distrib/f12/yum.repos.d/fedora.repo
new file mode 100644 (file)
index 0000000..00db188
--- /dev/null
@@ -0,0 +1,29 @@
+[fedora]
+name=Fedora 12 - $basearch
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/12/Everything/$basearch/os/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-12&arch=$basearch
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/12/Everything/$basearch/os/RPM-GPG-KEY-fedora-$basearch
+
+[fedora-debuginfo]
+name=Fedora 12 - $basearch - Debug
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/12/Everything/$basearch/debug/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-12&arch=$basearch
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/12/Everything/$basearch/os/RPM-GPG-KEY-fedora-$basearch
+
+[fedora-source]
+name=Fedora 12 - Source
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/12/Everything/source/SRPMS/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-12&arch=$basearch
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/12/Everything/$basearch/os/RPM-GPG-KEY-fedora-$basearch
diff --git a/distrib/f12/yum/yum.conf b/distrib/f12/yum/yum.conf
new file mode 100644 (file)
index 0000000..cd0ccc9
--- /dev/null
@@ -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/f13/pkgs/01 b/distrib/f13/pkgs/01
new file mode 100644 (file)
index 0000000..1a5ef72
--- /dev/null
@@ -0,0 +1 @@
+glibc
diff --git a/distrib/f13/pkgs/02 b/distrib/f13/pkgs/02
new file mode 100644 (file)
index 0000000..9ec5d2b
--- /dev/null
@@ -0,0 +1,3 @@
+--reinstall
+
+filesystem
diff --git a/distrib/f13/pkgs/03 b/distrib/f13/pkgs/03
new file mode 100644 (file)
index 0000000..218b1e6
--- /dev/null
@@ -0,0 +1,2 @@
+coreutils
+initscripts
diff --git a/distrib/f13/rpmlist.d/00.lst b/distrib/f13/rpmlist.d/00.lst
new file mode 100644 (file)
index 0000000..c825733
--- /dev/null
@@ -0,0 +1,11 @@
+glibc-[0-9]*.rpm
+basesystem-*.rpm
+bash-[0-9]*.rpm
+filesystem-*.rpm
+glibc-common-*.rpm
+libgcc-[0-9]*.rpm
+ncurses-base-[0-9]*.rpm
+ncurses-libs-*.rpm
+nss-softokn-freebl-*.rpm
+setup-*.rpm
+tzdata-*.rpm
diff --git a/distrib/f13/yum.repos.d/fedora-updates-testing.repo b/distrib/f13/yum.repos.d/fedora-updates-testing.repo
new file mode 100644 (file)
index 0000000..6042c31
--- /dev/null
@@ -0,0 +1,26 @@
+[updates-testing]
+name=Fedora 13 - $basearch - Test Updates
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/13/$basearch/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/$basearch/os/RPM-GPG-KEY-fedora-$basearch
+
+[updates-testing-debuginfo]
+name=Fedora 13 - $basearch - Test Updates Debug
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/13/$basearch/debug/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/$basearch/os/RPM-GPG-KEY-fedora-$basearch
+
+[updates-testing-source]
+name=Fedora 13 - Test Updates Source
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/13/SRPMS/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/$basearch/os/RPM-GPG-KEY-fedora-$basearch
diff --git a/distrib/f13/yum.repos.d/fedora-updates.repo b/distrib/f13/yum.repos.d/fedora-updates.repo
new file mode 100644 (file)
index 0000000..a58d078
--- /dev/null
@@ -0,0 +1,26 @@
+[updates]
+name=Fedora 13 - $basearch - Updates
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/13/$basearch/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f13&arch=$basearch
+enabled=1
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/$basearch/os/RPM-GPG-KEY-fedora-$basearch
+
+[updates-debuginfo]
+name=Fedora 13 - $basearch - Updates - Debug
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/13/$basearch/debug/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/$basearch/os/RPM-GPG-KEY-fedora-$basearch
+
+[updates-source]
+name=Fedora 13 - Updates Source
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/13/SRPMS/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/$basearch/os/RPM-GPG-KEY-fedora-$basearch
diff --git a/distrib/f13/yum.repos.d/fedora.repo b/distrib/f13/yum.repos.d/fedora.repo
new file mode 100644 (file)
index 0000000..bbc619b
--- /dev/null
@@ -0,0 +1,29 @@
+[fedora]
+name=Fedora 13 - $basearch
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/$basearch/os/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-13&arch=$basearch
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/$basearch/os/RPM-GPG-KEY-fedora-$basearch
+
+[fedora-debuginfo]
+name=Fedora 13 - $basearch - Debug
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/$basearch/debug/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-13&arch=$basearch
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/$basearch/os/RPM-GPG-KEY-fedora-$basearch
+
+[fedora-source]
+name=Fedora 13 - Source
+failovermethod=priority
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/source/SRPMS/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-13&arch=$basearch
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/$basearch/os/RPM-GPG-KEY-fedora-$basearch
diff --git a/distrib/f13/yum/yum.conf b/distrib/f13/yum/yum.conf
new file mode 100644 (file)
index 0000000..cd0ccc9
--- /dev/null
@@ -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
index 1f46709..80548d9 100644 (file)
@@ -33,21 +33,6 @@ create_dirs()
        $_MKDIR -p "$__RUNDIR" && $_MKDIR -p "$__VSHELPERSTATEDIR" && $_MKDIR -p `$_READLINK "$__PKGSTATEREVDIR"`
 }
 
-function mount_cgroup()
-{
-    _generateCgroupOptions
-    test -n "$CGROUP_MNT" || return 0
-    $_MKDIR -p "$CGROUP_MNT"
-    $_MOUNT -t cgroup -o "$CGROUP_SUBSYS" vserver "$CGROUP_MNT"
-}
-
-function umount_cgroup()
-{
-    _generateCgroupOptions
-    test -n "$CGROUP_MNT" || return 0
-    $_UMOUNT "$CGROUP_MNT"
-}
-
 start() {
        : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
        if [ ! -e ${UTIL_VSERVER_VARS} ]; then