From 15c6578666f5d3c12e4f7152af6b45fe97b1b5aa Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Thu, 27 May 2004 00:54:08 +0000 Subject: [PATCH] cleanups git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1579 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/vserver-build.debootstrap | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/util-vserver/scripts/vserver-build.debootstrap b/util-vserver/scripts/vserver-build.debootstrap index e477643..e804181 100644 --- a/util-vserver/scripts/vserver-build.debootstrap +++ b/util-vserver/scripts/vserver-build.debootstrap @@ -73,6 +73,12 @@ function findDebootstrap test -x "$DEBOOTSTRAP" || { echo $"Can not find debootstrap at '$DEBOOTSTRAP'" >&2; exit 1; } } +function fixupDebian +{ + rm -rf "$1"/dev + mv "$1"/dev.X "$1"/dev +} + ### main starts here <--- @@ -107,7 +113,6 @@ findDebootstrap test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" mv "$VDIR"/dev "$VDIR"/dev.X -"$DEBOOTSTRAP" "$DISTRIBUTION" "$VDIR" "$mirror" -rm -rf "$VDIR"/dev -mv "$VDIR"/dev.X "$VDIR"/dev +"$DEBOOTSTRAP" "$DISTRIBUTION" "$VDIR" "$mirror" || : ## HACK: ignore all errors... +fixupDebian "$VDIR" test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" -- 1.8.1.5