tags 473513 + patch thanks Patch attached.
Regards,
--
Chris Lamb, UK [EMAIL PROTECTED]
GPG: 0x634F9A20
diff -urNad dtc-xen-0.3.17.orig/src/dtc_create_vps.sh
dtc-xen-0.3.17/src/dtc_create_vps.sh
--- dtc-xen-0.3.17.orig/src/dtc_create_vps.sh 2008-04-10 05:06:24.000000000
+0100
+++ dtc-xen-0.3.17/src/dtc_create_vps.sh 2008-04-10 05:08:43.000000000
+0100
@@ -158,12 +158,12 @@
fi
tar -xvjpf /usr/src/gentoo/stage3-x86-2006.0.tar.bz2 -C
${VPSGLOBPATH}/${VPSNUM}
# grab the latest portage
- pushd /usr/src/gentoo
+ cd /usr/src/gentoo
wget -N http://gentoo.osuosl.org/snapshots/portage-latest.tar.bz2.md5sum
wget -N http://gentoo.osuosl.org/snapshots/portage-latest.tar.bz2
md5sum -c portage-latest.tar.bz2.md5sum
tar -xvjpf portage-latest.tar.bz2 -C ${VPSGLOBPATH}/${VPSNUM}/usr/
- popd
+ cd $OLDPWD
# need to reset the root password
sed -e 's/root:\*:/root::/' ${VPSGLOBPATH}/${VPSNUM}/etc/shadow >
${VPSGLOBPATH}/${VPSNUM}/etc/shadow.tmp
mv ${VPSGLOBPATH}/${VPSNUM}/etc/shadow.tmp
${VPSGLOBPATH}/${VPSNUM}/etc/shadow
@@ -258,7 +258,7 @@
# Set the resolv.conf
cp /etc/resolv.conf ${ETC}/resolv.conf
# Make the console device
- pushd ${VPSGLOBPATH}/${VPSNUM}/dev/; /sbin/MAKEDEV console; popd
+ cd ${VPSGLOBPATH}/${VPSNUM}/dev/; /sbin/MAKEDEV console; cd $OLDPWD
elif [ ""$DISTRO = "gentoo" ] ; then
cp -L /etc/resolv.conf ${ETC}/resolv.conf
echo "config_eth0=( \"${IPADDR} netmask ${NETMASK} broadcast
${BROADCAST}\" )
diff -urNad dtc-xen-0.3.17.orig/src/dtc_reinstall_os.sh
dtc-xen-0.3.17/src/dtc_reinstall_os.sh
--- dtc-xen-0.3.17.orig/src/dtc_reinstall_os.sh 2008-04-10 05:06:24.000000000
+0100
+++ dtc-xen-0.3.17/src/dtc_reinstall_os.sh 2008-04-10 05:08:21.000000000
+0100
@@ -206,12 +206,12 @@
fi
tar -xjpf /usr/src/gentoo/$GENTOO_STAGE3_ARCHIVE -C
${VPSGLOBPATH}/${VPSNUM}
# grab the latest portage
- pushd /usr/src/gentoo
+ cd /usr/src/gentoo
wget -N http://gentoo.osuosl.org/snapshots/portage-latest.tar.bz2.md5sum
wget -N http://gentoo.osuosl.org/snapshots/portage-latest.tar.bz2
md5sum -c portage-latest.tar.bz2.md5sum
tar -xjpf portage-latest.tar.bz2 -C ${VPSGLOBPATH}/${VPSNUM}/usr/
- popd
+ cd $OLDPWD
# need to reset the root password
sed -e 's/root:\*:/root::/' ${VPSGLOBPATH}/${VPSNUM}/etc/shadow >
${VPSGLOBPATH}/${VPSNUM}/etc/shadow.tmp
mv ${VPSGLOBPATH}/${VPSNUM}/etc/shadow.tmp
${VPSGLOBPATH}/${VPSNUM}/etc/shadow
@@ -223,9 +223,9 @@
fi
# download the image if it doesn't exist yet
if [ ! -e /usr/src/slackware/$JAILTIME_IMAGE ]; then
- pushd /usr/src/slackware
+ cd /usr/src/slackware
wget -N
"http://www.jailtime.org/lib/exe/fetch.php?cache=cache&media=download%3Aslackware%3Aslackware.11-0.20061220.img.tar.bz2";
- popd
+ cd $OLDPWD
fi
# if the internal image isn't present, extract it
if [ ! -e /usr/src/slackware/slackware.11-0.img ]; then
@@ -465,7 +465,7 @@
# Make all the generic devices (inclusive of sda1 and sda2)
mkdir -p ${VPSGLOBPATH}/${VPSNUM}/dev/
echo "Making VPS devices with MAKEDEV generic"
- pushd ${VPSGLOBPATH}/${VPSNUM}/dev/; /sbin/MAKEDEV generic; popd
+ cd ${VPSGLOBPATH}/${VPSNUM}/dev/; /sbin/MAKEDEV generic; cd $OLDPWD
if [ -d "${VPSGLOBPATH}/${VPSNUM}/lib/tls" ] ; then
echo "Disabling lib/tls"
mv "${VPSGLOBPATH}/${VPSNUM}/lib/tls"
"${VPSGLOBPATH}/${VPSNUM}/lib/tls.disabled"
signature.asc
Description: PGP signature
