[Debian-live-changes] r1156 - configs/daniel/config/chroot_localincludes/usr/local/bin

[Daniel Baumann]

Author: daniel
Date: 2007-04-24 12:53:34 +0000 (Tue, 24 Apr 2007)
New Revision: 1156

Modified:
   configs/daniel/config/chroot_localincludes/usr/local/bin/cdebootstraps
   configs/daniel/config/chroot_localincludes/usr/local/bin/dputs
Log:


Modified: configs/daniel/config/chroot_localincludes/usr/local/bin/cdebootstraps
===================================================================
--- configs/daniel/config/chroot_localincludes/usr/local/bin/cdebootstraps	2007-04-24 09:56:44 UTC (rev 1155)
+++ configs/daniel/config/chroot_localincludes/usr/local/bin/cdebootstraps	2007-04-24 12:53:34 UTC (rev 1156)
@@ -35,7 +35,7 @@
 
 case "${DISTRIBUTION}" in
 	oldstable-backports|"${CODENAME_OLDSTABLE}"-backports)
-		CHROOT="${DIRECTORY_CHROOT}/${CODENAME_OLDSTABLE}"
+		CHROOT="${DIRECTORY_CHROOT}/${CODENAME_OLDSTABLE}-backports"
 		DISTRIBUTION="${CODENAME_OLDSTABLE}"
 		;;
 
@@ -224,7 +224,7 @@
 		rsync -av --delete "${CHROOT}"/ "${CHROOT}".snapshot
 
 		# Remounting file systems
-		mount proc-${DISTRIBUTION} "${CHROOT}"/proc -t proc
+		mount proc-`basename ${CHROOT}` "${CHROOT}"/proc -t proc
 		;;
 
 	restore)
@@ -243,13 +243,13 @@
 		rsync -av --delete "${CHROOT}".snapshot/ "${CHROOT}"
 
 		# Remounting file systems
-		mount proc-${DISTRIBUTION} "${CHROOT}"/proc -t proc
+		mount proc-`basename ${CHROOT}` "${CHROOT}"/proc -t proc
 		;;
 
 	reset)
-		"${0}" restore ${DISTRIBUTION}
-		"${0}" update ${DISTRIBUTION}
-		"${0}" save ${DISTRIBUTION}
+		"${0}" restore `basename ${CHROOT}`
+		"${0}" update `basename ${CHROOT}`
+		"${0}" save `basename ${CHROOT}`
 		;;
 esac
 

Modified: configs/daniel/config/chroot_localincludes/usr/local/bin/dputs
===================================================================
--- configs/daniel/config/chroot_localincludes/usr/local/bin/dputs	2007-04-24 09:56:44 UTC (rev 1155)
+++ configs/daniel/config/chroot_localincludes/usr/local/bin/dputs	2007-04-24 12:53:34 UTC (rev 1156)
@@ -16,23 +16,10 @@
 	exit 1
 fi
 
-CODENAME_OLDSTABLE="sarge"
-CODENAME_OLDSTABLE_BACKPORTS="sarge"
-CODENAME_STABLE="etch"
-CODENAME_STABLE_BACKPORTS="etch"
-CODENAME_TESTING="lenny"
-CODENAME_UNSTABLE="sid"
-
-DIRECTORY_CHROOT="/mnt/debian"
-
-DISTRIBUTION="${1}"
-SPONSOR="${2}"
-USER="user"
-
 # Check configuration
-if [ ! -r ~/.dput.cf ]
+if [ ! -r ~/.dput.cf ] || [ "${1}" = "config" ]
 then
-echo >> ~/.dput.cf << EOF
+cat >> ~/.dput.cf << EOF
 [backports]
 fqdn = www.backports.org
 incoming = /
@@ -48,6 +35,19 @@
 exit 0
 fi
 
+CODENAME_OLDSTABLE="sarge"
+CODENAME_OLDSTABLE_BACKPORTS="sarge"
+CODENAME_STABLE="etch"
+CODENAME_STABLE_BACKPORTS="etch"
+CODENAME_TESTING="lenny"
+CODENAME_UNSTABLE="sid"
+
+DIRECTORY_CHROOT="/mnt/debian"
+
+DISTRIBUTION="${1}"
+SPONSOR="${2}"
+USER="user"
+
 if [ -z "${DISTRIBUTION}" ]
 then
 	DISTRIBUTION="unstable"
@@ -55,7 +55,7 @@
 
 case "${DISTRIBUTION}" in
 	oldstable-backports|"${CODENAME_OLDSTABLE}"-backports)
-		DISTRIBUTION="${CODENAME_OLDSTABLE}"
+		DISTRIBUTION="${CODENAME_OLDSTABLE}-backports"
 		;;
 
 	stable-backports|"${CODENAME_STABLE}"-backports)