Changeset 2571
- Timestamp:
- 07/29/07 18:55:06 (1 year ago)
- Files:
-
- trunk/distrib/Makefile.am (modified) (4 diffs)
- trunk/distrib/breezy (added)
- trunk/distrib/breezy/debootstrap.script (added)
- trunk/distrib/dapper (added)
- trunk/distrib/dapper/debootstrap.script (added)
- trunk/distrib/debian (moved) (moved from trunk/distrib/etch)
- trunk/distrib/debian/debootstrap.script (added)
- trunk/distrib/debian/initpost (modified) (2 diffs)
- trunk/distrib/edgy (added)
- trunk/distrib/edgy/debootstrap.script (added)
- trunk/distrib/feisty (added)
- trunk/distrib/feisty/debootstrap.script (added)
- trunk/distrib/gutsy (added)
- trunk/distrib/gutsy/debootstrap.script (added)
- trunk/distrib/hoary (added)
- trunk/distrib/hoary/debootstrap.script (added)
- trunk/distrib/warty (added)
- trunk/distrib/warty/debootstrap.script (added)
- trunk/scripts/vserver-build.debootstrap (modified) (4 diffs)
- trunk/scripts/vserver-build.functions (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/distrib/Makefile.am
r2558 r2571 37 37 gentoo/initpost \ 38 38 gentoo/initpre \ 39 etch/initpost39 debian/initpost 40 40 41 41 nobase_distrib_DATA = defaults/devs \ … … 70 70 gentoo/init-vserver.sh gentoo/net.vserver \ 71 71 gentoo/reboot.sh gentoo/shutdown.sh \ 72 etch/vserver-config.sh 72 debian/vserver-config.sh debian/debootstrap.script \ 73 breezy/debootstrap.script dapper/debootstrap.script \ 74 edgy/debootstrap.script feisty/debootstrap.script \ 75 gutsy/debootstrap.script hoary/debootstrap.script \ 76 warty/debootstrap.script 73 77 74 78 nobase_confdistrib_DATA = rh9/apt/sources.list \ … … 91 95 92 96 redhat_style = rh9 fc1 fc2 fc3 fc4 fc5 fc6 f7 centos4 centos5 97 sid_style = etch lenny sid 93 98 94 99 install-exec-hook: install-notify-xtra … … 100 105 ln -sf ../redhat/initpre $(DESTDIR)$(distribdir)/$$i/; \ 101 106 done 107 l="$(sid_style)"; for i in $$l; do \ 108 ln -sf debian $(DESTDIR)$(distribdir)/$$i; \ 109 done 102 110 $(mkinstalldirs) $(DESTDIR)$(confdir) \ 103 111 $(DESTDIR)$(confdistribdir)/.common/pubkeys \ trunk/distrib/debian/initpost
r2528 r2571 27 27 NAME=$(< "$cfgdir"/name) 28 28 29 # debian mirror30 MIRROR=$331 32 # debian distribution33 DIST="etch"34 35 29 36 30 # go to vdir for chroot-sh … … 60 54 # make apt and friends work 61 55 $_CHROOT_SH truncate /etc/apt/sources.list <<EOF 62 deb $MIRROR/ $DIST main63 deb-src $MIRROR/ $DIST main56 deb $MIRROR/ $DISTRIBUTION main 57 deb-src $MIRROR/ $DISTRIBUTION main 64 58 65 deb http://security.debian.org $DIST /updates main59 deb http://security.debian.org $DISTRIBUTION/updates main 66 60 EOF 67 61 trunk/scripts/vserver-build.debootstrap
r2528 r2571 19 19 { 20 20 workdir= 21 mirror= 21 MIRROR= 22 options= 22 23 } 23 24 … … 26 27 base.init 27 28 28 test -n "${ mirror}" || {29 test -n "${MIRROR}" || { 29 30 local aux 30 findFile aux "$__CONFDIR"/.defaults/apps/debootstrap/mirror "$__PKGLIBDEFAULTDIR"/debootstrap.mirror 31 test -z "$aux" || read mirror <"$aux" 31 findFile aux "$__CONFDIR"/.distributions/"$DISTRIBUTION"/debootstrap.mirror \ 32 "$__CONFDIR"/.defaults/apps/debootstrap/mirror \ 33 "$__DISTRIBDIR"/"$DISTRIBUTION"/debootstrap.mirror \ 34 "$__PKGLIBDEFAULTDIR"/debootstrap.mirror 35 test -z "$aux" || read MIRROR <"$aux" 32 36 } 37 local file 38 findFile file "$__CONFDIR"/.distributions/"$DISTRIBUTION"/debootstrap.options \ 39 "$__CONFDIR"/.defaults/apps/debootstrap/options 40 test -z "$file" || read options <"$file" 33 41 } 34 42 … … 126 134 case "$1" in 127 135 (-d) DISTRIBUTION=$2; shift;; 128 (-m) mirror=$2; shift;;136 (-m) MIRROR=$2; shift;; 129 137 (-s) script=$2; shift;; 130 138 (--debug) set -x;; … … 147 155 findDebootstrap 148 156 149 test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" "$mirror" 157 if test -z "$script"; then 158 for s in "$__CONFDIR/.distributions/$DISTRIBUTION/debootstrap.script" 159 "$__DISTRIBDIR/$DISTRIBUTION/debootstrap.script" 160 do 161 if test -e "$s"; then 162 script="$s" 163 break 164 fi 165 done 166 fi 167 168 export MIRROR 169 test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" 150 170 mv "$VDIR"/dev "$VDIR"/dev.X 151 "$_VNAMESPACE" --new -- "$DEBOOTSTRAP" "$@" "$DISTRIBUTION" "$VDIR" "$mirror" "$script" || : ## HACK: ignore all errors... 171 "$_VNAMESPACE" --new -- \ 172 "$DEBOOTSTRAP" $options "$@" "$DISTRIBUTION" "$VDIR" "$MIRROR" "$script" || : ## HACK: ignore all errors... 152 173 fixupDebian "$VDIR" 153 test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" "$mirror"174 test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" 154 175 155 176 $_RM -fr "$workdir" trunk/scripts/vserver-build.functions
r2515 r2571 184 184 please read http://linux-vserver.org/HowToRegisterNewDistributions 185 185 for information how to add support for your own distribution." 186 187 export DISTRIBUTION 186 188 } 187 189
