Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-30 04:01:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for SECMIRROR versus SRCMIRROR for Colin

Browse Source
This commit is contained in:
Adam Conrad 2005-11-19 05:08:28 +00:00
parent d187b32999
commit d72419af3d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -5,8 +5,11 @@ livecd-rootfs (0.25) hoary-cat-UNRELEASED; urgency=low
[ Adam Conrad ] [ Adam Conrad ]
* Make livecd.sh umount the lrm tmpfs during the cleanup process. * 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 livecd-rootfs (0.24) hoary-cat; urgency=low

5
livecd.sh
View File

@ -52,15 +52,18 @@ case $ARCH in
i386|powerpc|amd64) i386|powerpc|amd64)
USERMIRROR=http://archive.ubuntu.com/ubuntu USERMIRROR=http://archive.ubuntu.com/ubuntu
SECMIRROR=http://security.ubuntu.com/ubuntu SECMIRROR=http://security.ubuntu.com/ubuntu
SECSRCMIRROR=${SECMIRROR}
;; ;;
hppa) hppa)
USERMIRROR=http://ports.ubuntu.com/ubuntu-ports USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
SECMIRROR=${USERMIRROR} SECMIRROR=${USERMIRROR}
SECSRCMIRROR=${SRCMIRROR}
#COMP="main restricted universe" #COMP="main restricted universe"
;; ;;
*) *)
USERMIRROR=http://ports.ubuntu.com/ubuntu-ports USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
SECMIRROR=${USERMIRROR} SECMIRROR=${USERMIRROR}
SECSRCMIRROR=${SRCMIRROR}
;; ;;
esac esac
case $(hostname --fqdn) in case $(hostname --fqdn) in
@ -256,7 +259,7 @@ deb-src ${SRCMIRROR} $STE ${COMP}
# deb-src ${SRCMIRROR} $STE universe # deb-src ${SRCMIRROR} $STE universe
deb ${SECMIRROR} ${STE}-security ${COMP} deb ${SECMIRROR} ${STE}-security ${COMP}
deb-src ${SRCMIRROR} ${STE}-security ${COMP} deb-src ${SECSRCMIRROR} ${STE}-security ${COMP}
@@EOF @@EOF
mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg