Changes for move of master and useful
This commit is contained in:
parent
bcf1c5c8b4
commit
2afd3fa6e2
17
debian_cd
17
debian_cd
|
@ -6,6 +6,7 @@
|
||||||
#
|
#
|
||||||
# Changes for using $CODENAME (C) 1999 Jens Ritter <grimaldi@debian.org>
|
# Changes for using $CODENAME (C) 1999 Jens Ritter <grimaldi@debian.org>
|
||||||
# 06-13-99 updated locations for override.potato.gz in non-US <jwest@debian.org>
|
# 06-13-99 updated locations for override.potato.gz in non-US <jwest@debian.org>
|
||||||
|
# 07-06-99 moved master & useful to release directories <jwest>
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
|
@ -289,11 +290,13 @@ vecho NF=$NF
|
||||||
vecho SINGLE_DISK=$SINGLE_DISK
|
vecho SINGLE_DISK=$SINGLE_DISK
|
||||||
|
|
||||||
# Sort out non-US link - this should be done better...
|
# Sort out non-US link - this should be done better...
|
||||||
|
|
||||||
if [ "$NU"x = "1"x ] ; then
|
if [ "$NU"x = "1"x ] ; then
|
||||||
vecho Checking for non-US link in $MIRROR/dists/$CODENAME
|
vecho Checking for non-US link in $MIRROR/dists/$CODENAME
|
||||||
if [ ! -L $MIRROR/dists/$CODENAME/non-US -a ! -d $MIRROR/dists/$CODENAME/non-US ] ; then
|
if [ ! -L $MIRROR/dists/$CODENAME/non-US -a ! -d $MIRROR/dists/$CODENAME/non-US ] ; then
|
||||||
vecho "Does not exist; trying to make one"
|
vecho "Does not exist; trying to make one"
|
||||||
(cd $MIRROR/dists/$CODENAME && ln -s $NONUS/dists/$CODENAME/non-US >/dev/null 2>&1 ) # Redirect errors - people may have a read-only mirror...
|
# (cd $MIRROR/dists/$CODENAME && ln -s $NONUS/dists/$CODENAME/non-US >/dev/null 2>&1 ) # Redirect errors - people may have a read-only mirror...
|
||||||
|
(cd $MIRROR/dists/$CODENAME && ln -s $NONUS/dists/$CODENAME/non-US/main non-US >/dev/null 2>&1 ) # Redirect errors - people may have a read-only mirror...
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -477,14 +480,14 @@ else
|
||||||
cat mkisofsrc | sed "s/ARCH/$ARCH/g" >$TDIR/.mkisofs
|
cat mkisofsrc | sed "s/ARCH/$ARCH/g" >$TDIR/.mkisofs
|
||||||
ln -s .mkisofs $TDIR/.mkisofsrc
|
ln -s .mkisofs $TDIR/.mkisofsrc
|
||||||
vecho " cd1.needed"
|
vecho " cd1.needed"
|
||||||
slice master
|
slice $CODENAME/master
|
||||||
if [ $? -gt 0 ] ; then
|
if [ $? -gt 0 ] ; then
|
||||||
echo "\"slice master\" failed - do you have the slice package installed?"
|
echo "\"slice $CODENAME\master\" failed - do you have the slice package installed?"
|
||||||
echo Exit.
|
echo Exit.
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
echo "# Do not edit this file - it is automatically generated." >$TDIR/cd1.needed
|
echo "# Do not edit this file - it is automatically generated." >$TDIR/cd1.needed
|
||||||
echo "# Edit \"master\" instead." >>$TDIR/cd1.needed
|
echo "# Edit \"$CODENAME/master\" instead." >>$TDIR/cd1.needed
|
||||||
cat master.$ARCH | awk -F':' '
|
cat master.$ARCH | awk -F':' '
|
||||||
/Packages:/ {packages++; next}
|
/Packages:/ {packages++; next}
|
||||||
/.+.+/ {if(packages) {print $1}}
|
/.+.+/ {if(packages) {print $1}}
|
||||||
|
@ -492,14 +495,14 @@ else
|
||||||
rm master.*
|
rm master.*
|
||||||
|
|
||||||
vecho " cd1.useful"
|
vecho " cd1.useful"
|
||||||
slice useful
|
slice $CODENAME/useful
|
||||||
if [ $? -gt 0 ] ; then
|
if [ $? -gt 0 ] ; then
|
||||||
echo "\"slice useful\" failed - do you have the slice package installed?"
|
echo "\"slice $CODENAME/useful\" failed - do you have the slice package installed?"
|
||||||
echo Exit.
|
echo Exit.
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
echo "# Do not edit this file - it is automatically generated." >$TDIR/cd1.useful
|
echo "# Do not edit this file - it is automatically generated." >$TDIR/cd1.useful
|
||||||
echo "# Edit \"useful\" instead." >>$TDIR/cd1.useful
|
echo "# Edit \"$CODENAME/useful\" instead." >>$TDIR/cd1.useful
|
||||||
cat useful.$ARCH | awk -F':' '
|
cat useful.$ARCH | awk -F':' '
|
||||||
/.+.+/ {print $1}
|
/.+.+/ {print $1}
|
||||||
' |sort |uniq >>$TDIR/cd1.useful
|
' |sort |uniq >>$TDIR/cd1.useful
|
||||||
|
|
Loading…
Reference in New Issue