From ab20b113ea62eb636df2434d784166d7e84daada Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Thu, 30 Jun 2005 06:06:14 +0000 Subject: [PATCH] use CHROOT_SH instead of CHROOT_* git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2101 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/distrib/redhat/initpost | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/util-vserver/distrib/redhat/initpost b/util-vserver/distrib/redhat/initpost index b9ae64d..f281656 100755 --- a/util-vserver/distrib/redhat/initpost +++ b/util-vserver/distrib/redhat/initpost @@ -33,9 +33,9 @@ function subst case "$1" in (/*|./*) cat "$1";; - (*) $_CHROOT_CAT -i "$1";; + (*) $_CHROOT_SH cat "$1";; esac | sed -e "$2" >$tmp - cmp -s $tmp "$1" || $_CHROOT_CAT -o "$1" <$tmp + cmp -s $tmp "$1" || $_CHROOT_SH truncate "$1" <$tmp rm -f $tmp } @@ -66,13 +66,13 @@ pushd "$vdir"/usr/bin &>/dev/null popd >/dev/null pushd "$vdir" &>/dev/null - echo 'NETWORKING=yes' | $_CHROOT_CAT -a /etc/sysconfig/network + echo 'NETWORKING=yes' | $_CHROOT_SH append /etc/sysconfig/network popd >/dev/null pushd "$vdir" &>/dev/null - : | $_CHROOT_CAT -o /etc/sysctl.conf - echo "none / none defaults" | $_CHROOT_CAT -o /etc/fstab - cat "$__DISTRIBDIR"/redhat/rc.sysinit | $_CHROOT_CAT -o /etc/rc.d/rc.sysinit.vserver + : | $_CHROOT_SH truncate /etc/sysctl.conf + echo "none / none defaults" | $_CHROOT_SH truncate /etc/fstab + cat "$__DISTRIBDIR"/redhat/rc.sysinit | $_CHROOT_SH truncate /etc/rc.d/rc.sysinit.vserver # TODO: remove race/symlink-attack chmod +x etc/rc.d/rc.sysinit.vserver subst etc/inittab 's!^\([^#].*:respawn:.* tty\)!#\1!; -- 1.8.1.5