Changeset 2528
- Timestamp:
- 04/13/07 11:02:29 (2 years ago)
- Files:
-
- trunk/distrib/Makefile.am (modified) (3 diffs)
- trunk/distrib/etch (added)
- trunk/distrib/etch/initpost (added)
- trunk/distrib/etch/vserver-config.sh (added)
- trunk/distrib/misc/debootstrap.mirror (added)
- trunk/scripts/vserver-build.debootstrap (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/distrib/Makefile.am
r2524 r2528 22 22 confdefaultsdir = $(confdir)/.defaults 23 23 24 defaults_DATA = misc/debootstrap.uri \ 24 defaults_DATA = misc/debootstrap.mirror \ 25 misc/debootstrap.uri \ 25 26 misc/fstab \ 26 27 misc/mtab \ … … 34 35 redhat/rc.sysinit \ 35 36 gentoo/initpost \ 36 gentoo/initpre 37 gentoo/initpre \ 38 etch/initpost 37 39 38 40 nobase_distrib_DATA = defaults/devs \ … … 61 63 suse91/rpm/macros \ 62 64 gentoo/init-vserver.sh gentoo/net.vserver \ 63 gentoo/reboot.sh gentoo/shutdown.sh 65 gentoo/reboot.sh gentoo/shutdown.sh \ 66 etch/vserver-config.sh 64 67 65 68 nobase_confdistrib_DATA = rh9/apt/sources.list \ trunk/scripts/vserver-build.debootstrap
r2522 r2528 26 26 base.init 27 27 28 test -n "${mirror -unset}" || {28 test -n "${mirror}" || { 29 29 local aux 30 findFile aux "$__CONFDIR"/.defaults/apps/debootstrap/mirror ''30 findFile aux "$__CONFDIR"/.defaults/apps/debootstrap/mirror "$__PKGLIBDEFAULTDIR"/debootstrap.mirror 31 31 test -z "$aux" || read mirror <"$aux" 32 32 } … … 147 147 findDebootstrap 148 148 149 test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" 149 test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" "$mirror" 150 150 mv "$VDIR"/dev "$VDIR"/dev.X 151 151 "$_VNAMESPACE" --new -- "$DEBOOTSTRAP" "$@" "$DISTRIBUTION" "$VDIR" "$mirror" "$script" || : ## HACK: ignore all errors... 152 152 fixupDebian "$VDIR" 153 test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" 153 test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" "$mirror" 154 154 155 155 $_RM -fr "$workdir"
