Le lundi 25 février 2013 à 15:15 -0600, Serge Hallyn a écrit :
> Quoting Frederic Crozat (fcro...@suse.com):
> > Hi all,
> >
> > following our previous discussion, and since openSUSE 12.3 is near
> > release, it is probably a good idea to update openSUSE template to 12.3,
> > since this release will be the one available by the time lxc 0.9.0 is
> > out.
> >
> > Please make sure to apply after Jiri patches (which have been acked
> > already).
> > --
> > Frederic Crozat <fcro...@suse.com>
>
> Please do add 'Signed-off-by'
Done.
--
Frederic Crozat <fcro...@suse.com>
SUSE
>From 8cf2b2329738bdb52dd361b2d0c98d60b9df8365 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcro...@suse.com>
Date: Mon, 25 Feb 2013 18:28:00 +0100
Subject: [PATCH] templates: update for openSUSE 12.3
Update template to install openSUSE 12.3
Signed-off-by: Frederic Crozat <fcro...@suse.com>
---
templates/lxc-opensuse.in | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in
index d8aa2a1..77ef6b2 100644
--- a/templates/lxc-opensuse.in
+++ b/templates/lxc-opensuse.in
@@ -25,7 +25,7 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-DISTRO=12.2
+DISTRO=12.3
configure_opensuse()
{
@@ -58,7 +58,6 @@ EOF
127.0.0.1 localhost $hostname
EOF
- # disable various services
# disable yast->bootloader in container
cat <<EOF > $rootfs/etc/sysconfig/bootloader
LOADER_TYPE=none
@@ -81,7 +80,14 @@ EOF
ln -s /dev/null $rootfs/etc/systemd/system/proc-sys-fs-binfmt_misc.automount
ln -s /dev/null $rootfs/etc/systemd/system/console-shell.service
ln -s /dev/null $rootfs/etc/systemd/system/systemd-vconsole-setup.service
- ln -s /lib/systemd/system/getty@.service $rootfs/etc/systemd/system/getty.target.wants/getty@console.service
+ sed -e 's/ConditionPathExists=.*//' /usr/lib/systemd/system/getty@.service > $rootfs/etc/systemd/system/getty@.service
+ ln -s getty@.service $rootfs/etc/systemd/system/getty@tty1.service
+ ln -s ../getty@.service $rootfs/etc/systemd/system/getty.target.wants/getty@console.service
+ ln -s -f ../getty@.service $rootfs/etc/systemd/system/getty.target.wants/getty@tty1.service
+ ln -s ../getty@.service $rootfs/etc/systemd/system/getty.target.wants/getty@tty2.service
+ ln -s ../getty@.service $rootfs/etc/systemd/system/getty.target.wants/getty@tty3.service
+ ln -s ../getty@.service $rootfs/etc/systemd/system/getty.target.wants/getty@tty4.service
+
touch $rootfs/etc/sysconfig/kernel
@@ -116,12 +122,12 @@ download_opensuse()
zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss/ repo-oss || return 1
zypper --quiet --root $cache/partial-$arch-packages --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update || return 1
zypper --quiet --root $cache/partial-$arch-packages --non-interactive --gpg-auto-import-keys update || return 1
- zypper --root $cache/partial-$arch-packages --non-interactive in --auto-agree-with-licenses --download-only zypper lxc patterns-openSUSE-base bash iputils sed tar || return 1
+ zypper --root $cache/partial-$arch-packages --non-interactive in --auto-agree-with-licenses --download-only zypper lxc patterns-openSUSE-base bash iputils sed tar rsyslog || return 1
cat > $cache/partial-$arch-packages/opensuse.conf << EOF
Preinstall: aaa_base bash coreutils diffutils
-Preinstall: filesystem fillup glibc grep insserv
-Preinstall: libbz2-1 libgcc47 libncurses5 pam
-Preinstall: permissions libreadline6 rpm sed tar zlib libselinux1
+Preinstall: filesystem fillup glibc grep insserv-compat
+Preinstall: libbz2-1 libgcc_s1 libncurses5 pam
+Preinstall: permissions libreadline6 rpm sed tar libz1 libselinux1
Preinstall: liblzma5 libcap2 libacl1 libattr1
Preinstall: libpopt0 libelf1 liblua5_1
Preinstall: libpcre1
@@ -135,8 +141,8 @@ Support: ncurses-utils
Support: iputils
Support: udev
Support: netcfg
-Support: dhcpcd hwinfo insserv module-init-tools openSUSE-release openssh
-Support: pwdutils rpcbind sysconfig rsyslog
+Support: dhcpcd hwinfo insserv-compat module-init-tools openSUSE-release openssh
+Support: pwdutils rpcbind sysconfig
Ignore: rpm:suse-build-key,build-key
Ignore: systemd:systemd-presets-branding
--
1.8.1.4
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
