X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-build.functions;h=1c96613d752e8ef86dcc694f34be716da7ecfd37;hb=60295bc3135d3e16d4f5c4aed6882132546326d5;hp=7baae596be85f0870f918ae61c99edd55e8f9300;hpb=83dc12f004f86d8865a745679cc8d9753a79b82f;p=util-vserver.git diff --git a/scripts/vserver-build.functions b/scripts/vserver-build.functions index 7baae59..1c96613 100644 --- a/scripts/vserver-build.functions +++ b/scripts/vserver-build.functions @@ -50,6 +50,17 @@ function makeDevEntry esac } +function populateDev +{ + local spec + + mkdir -p -m755 "$VDIR"/dev/pts + + while read spec; do + makeDevEntry "$VDIR"/dev $spec + done <$_DEV_FILE +} + function populateDirectory { local dst=$1 @@ -191,16 +202,13 @@ exist already; please try to use '--force', or remove them manually." $_SETATTR --~barrier "$VDIR" base._addGeneratedFile "$VDIR" - mkdir -p -m755 "$SETUP_CONFDIR"/apps "$VDIR"/{dev/pts,etc} + mkdir -p -m755 "$SETUP_CONFDIR"/apps "$VDIR"/etc base._addGeneratedFile "$SETUP_CONFDIR" ln -s "$VDIR" "$SETUP_CONFDIR/vdir" ln -s "$CACHEDIR/$VSERVERDIRNAME" "$SETUP_CONFDIR/cache" - local spec - while read spec; do - makeDevEntry "$VDIR"/dev $spec - done <$_DEV_FILE + populateDev mkdir -p "$VDIR"/proc findAndCopy "$VDIR"/etc/hosts "$__CONFDIR"/.defaults/files/hosts "$__CONFDIR/.distributions/$DISTRIBUTION"/files/hosts \