mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-05-17 13:51:32 +00:00
postfix stripping conditional, ports.u.c fixes
This commit is contained in:
parent
cfe3183c6d
commit
3e1e7ae391
8
debian/changelog
vendored
8
debian/changelog
vendored
@ -1,3 +1,11 @@
|
|||||||
|
livecd-rootfs (0.21) hoary-cat-UNRELEASED; urgency=low
|
||||||
|
|
||||||
|
* a bit more ports.ubuntu.com cleanup: deb-src still needs to point at
|
||||||
|
archive.ubuntu.com.
|
||||||
|
* postfix isn't there anymore, make the postfix stripping stuff conditional.
|
||||||
|
|
||||||
|
-- LaMont Jones <lamont@ubuntu.com> Wed, 1 Jun 2005 00:08:09 -0600
|
||||||
|
|
||||||
livecd-rootfs (0.20) hoary-cat; urgency=low
|
livecd-rootfs (0.20) hoary-cat; urgency=low
|
||||||
|
|
||||||
* incorporate ports.ubuntu.com repositories
|
* incorporate ports.ubuntu.com repositories
|
||||||
|
11
livecd.sh
11
livecd.sh
@ -45,6 +45,7 @@ fi
|
|||||||
umask 022
|
umask 022
|
||||||
export TTY=unknown
|
export TTY=unknown
|
||||||
export TERM=vt100
|
export TERM=vt100
|
||||||
|
SRCMIRROR=http://archive.ubuntu.com/ubuntu
|
||||||
case $(dpkg --print-architecture) in
|
case $(dpkg --print-architecture) in
|
||||||
i386|powerpc|amd64)
|
i386|powerpc|amd64)
|
||||||
USERMIRROR=http://archive.ubuntu.com/ubuntu
|
USERMIRROR=http://archive.ubuntu.com/ubuntu
|
||||||
@ -209,7 +210,7 @@ link_in_boot = no
|
|||||||
cleanup
|
cleanup
|
||||||
cat << @@EOF > ${ROOT}etc/apt/sources.list
|
cat << @@EOF > ${ROOT}etc/apt/sources.list
|
||||||
deb ${USERMIRROR} $STE main restricted
|
deb ${USERMIRROR} $STE main restricted
|
||||||
deb-src ${USERMIRROR} $STE main restricted
|
deb-src ${SRCMIRROR} $STE main restricted
|
||||||
|
|
||||||
## Uncomment the following two lines to add software from the 'universe'
|
## Uncomment the following two lines to add software from the 'universe'
|
||||||
## repository.
|
## repository.
|
||||||
@ -219,10 +220,10 @@ deb-src ${USERMIRROR} $STE main restricted
|
|||||||
## universe WILL NOT receive any review or updates from the Ubuntu security
|
## universe WILL NOT receive any review or updates from the Ubuntu security
|
||||||
## team.
|
## team.
|
||||||
# deb ${USERMIRROR} $STE universe
|
# deb ${USERMIRROR} $STE universe
|
||||||
# deb-src ${USERMIRROR} $STE universe
|
# deb-src ${SRCMIRROR} $STE universe
|
||||||
|
|
||||||
deb ${SECMIRROR} ${STE}-security main restricted
|
deb ${SECMIRROR} ${STE}-security main restricted
|
||||||
deb-src ${SECMIRROR} ${STE}-security main restricted
|
deb-src ${SRCMIRROR} ${STE}-security main restricted
|
||||||
@@EOF
|
@@EOF
|
||||||
mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg
|
mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg
|
||||||
|
|
||||||
@ -231,10 +232,12 @@ deb-src ${SECMIRROR} ${STE}-security main restricted
|
|||||||
rm -f ${ROOT}var/lib/apt/lists/*_*
|
rm -f ${ROOT}var/lib/apt/lists/*_*
|
||||||
rm -f ${ROOT}var/spool/postfix/maildrop/*
|
rm -f ${ROOT}var/spool/postfix/maildrop/*
|
||||||
chroot $ROOT apt-get update || true # give them fresh lists, but don't fail
|
chroot $ROOT apt-get update || true # give them fresh lists, but don't fail
|
||||||
rm ${ROOT}etc/resolv.conf ${ROOT}etc/mailname
|
rm -f ${ROOT}etc/resolv.conf ${ROOT}etc/mailname
|
||||||
|
if [ -f ${ROOT}/etc/postfix/main.cf ]; then
|
||||||
sed -i '/^myhostname/d; /^mydestination/d; /^myorigin/d' ${ROOT}etc/postfix/main.cf
|
sed -i '/^myhostname/d; /^mydestination/d; /^myorigin/d' ${ROOT}etc/postfix/main.cf
|
||||||
echo set postfix/destinations | chroot ${ROOT} /usr/bin/debconf-communicate postfix
|
echo set postfix/destinations | chroot ${ROOT} /usr/bin/debconf-communicate postfix
|
||||||
echo set postfix/mailname | chroot ${ROOT} /usr/bin/debconf-communicate postfix
|
echo set postfix/mailname | chroot ${ROOT} /usr/bin/debconf-communicate postfix
|
||||||
|
fi
|
||||||
chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' > livecd.${FS}.manifest
|
chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' > livecd.${FS}.manifest
|
||||||
|
|
||||||
mkdir -p livecd.mnt
|
mkdir -p livecd.mnt
|
||||||
|
Loading…
x
Reference in New Issue
Block a user