mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-22 02:41:12 +00:00
Fixes for SECMIRROR versus SRCMIRROR for Colin
This commit is contained in:
parent
d187b32999
commit
d72419af3d
5
debian/changelog
vendored
5
debian/changelog
vendored
@ -5,8 +5,11 @@ livecd-rootfs (0.25) hoary-cat-UNRELEASED; urgency=low
|
||||
|
||||
[ Adam Conrad ]
|
||||
* Make livecd.sh umount the lrm tmpfs during the cleanup process.
|
||||
* Make our sources.list use SECSRCMIRROR instead of SRCMIRROR for security
|
||||
sources, defaulting to SECMIRROR for release arches and SRCMIRROR for
|
||||
ports (since ports don't have security binaries and sources in one place)
|
||||
|
||||
-- LaMont Jones <lamont@ubuntu.com> Thu, 10 Nov 2005 15:59:33 -0700
|
||||
-- Adam Conrad <adconrad@ubuntu.com> Sat, 19 Nov 2005 15:54:33 +1100
|
||||
|
||||
livecd-rootfs (0.24) hoary-cat; urgency=low
|
||||
|
||||
|
@ -52,15 +52,18 @@ case $ARCH in
|
||||
i386|powerpc|amd64)
|
||||
USERMIRROR=http://archive.ubuntu.com/ubuntu
|
||||
SECMIRROR=http://security.ubuntu.com/ubuntu
|
||||
SECSRCMIRROR=${SECMIRROR}
|
||||
;;
|
||||
hppa)
|
||||
USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
|
||||
SECMIRROR=${USERMIRROR}
|
||||
SECSRCMIRROR=${SRCMIRROR}
|
||||
#COMP="main restricted universe"
|
||||
;;
|
||||
*)
|
||||
USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
|
||||
SECMIRROR=${USERMIRROR}
|
||||
SECSRCMIRROR=${SRCMIRROR}
|
||||
;;
|
||||
esac
|
||||
case $(hostname --fqdn) in
|
||||
@ -256,7 +259,7 @@ deb-src ${SRCMIRROR} $STE ${COMP}
|
||||
# deb-src ${SRCMIRROR} $STE universe
|
||||
|
||||
deb ${SECMIRROR} ${STE}-security ${COMP}
|
||||
deb-src ${SRCMIRROR} ${STE}-security ${COMP}
|
||||
deb-src ${SECSRCMIRROR} ${STE}-security ${COMP}
|
||||
@@EOF
|
||||
mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user