From 04ef51194afd5168dee1924d85d02acffc80b2e0 Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Fri, 27 Apr 2007 09:02:31 +0000 Subject: [PATCH] add dummy net dependency to default runlevel; dmesg/syslog is now handled in baselayout git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2537 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- distrib/gentoo/initpost | 8 +++++--- distrib/gentoo/initpre | 4 ---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/distrib/gentoo/initpost b/distrib/gentoo/initpost index 1e457c3..af89200 100755 --- a/distrib/gentoo/initpost +++ b/distrib/gentoo/initpost @@ -46,8 +46,9 @@ chrootsed() { # portage stuff -$_CHROOT_SH mkdir /usr 2>/dev/null || : +$_CHROOT_SH mkdir /usr 2>/dev/null || : $_CHROOT_SH mkdir /usr/portage 2>/dev/null || : +$_CHROOT_SH mkdir /usr/portage/distfiles 2>/dev/null || : # gentoo initstyle magic @@ -111,17 +112,18 @@ if $_CHROOT_SH testfile /etc/inittab; then fi -# fix fstab for checkfs/localmount in baselayout >= 1.13 +# fix fstab for checkfs/localmount in baselayout-2 # (does not affect any previous versions) echo ">>> Fixing fstab ... " echo "/dev/hdv1 / ufs defaults 0 0" | $_CHROOT_SH truncate /etc/fstab -# always satisfy net dependency in baselayout >= 1.13 +# always satisfy net dependency in baselayout-2 # (does not affect any previous versions) echo ">>> Providing dummy net dependency ... " $_CAT "$__DISTRIBDIR"/gentoo/net.vserver | \ $_CHROOT_SH truncate /etc/init.d/net.vserver $_CHROOT_SH chmod 0755 /etc/init.d/net.vserver +$_CHROOT_SH link /etc/init.d/net.vserver /etc/runlevels/boot/net.vserver popd &>/dev/null diff --git a/distrib/gentoo/initpre b/distrib/gentoo/initpre index 0cd9b24..4a66bf5 100755 --- a/distrib/gentoo/initpre +++ b/distrib/gentoo/initpre @@ -50,10 +50,6 @@ else echo "!!! shared distfiles directory if you have multiple Gentoo guests!" fi -# prevent dmesg errors/warnings -echo ">>> Enabling dummy /proc/kmsg" -echo syslog >> "$1"/ccapabilities - # initstyle sanity initstyle=sysv -- 1.8.1.5