Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-06 15:42:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

live/desktop split

Browse Source
This commit is contained in:
Adam Conrad 2006-03-10 09:06:12 +00:00
parent 463154841e
commit 99fd422f7e
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -4,6 +4,9 @@ livecd-rootfs (0.27) UNRELEASED; urgency=low
* Copy the kernel out of the livefs as well, so we have one that matches. * Copy the kernel out of the livefs as well, so we have one that matches.
* Enable rudimentary support for squashfs filesystems, initially enabling * Enable rudimentary support for squashfs filesystems, initially enabling
it on the primary architectures only (powerpc, i386, amd64) it on the primary architectures only (powerpc, i386, amd64)
* Split the package LIST into LIST and LIVELIST, and generate a manifest
before installing LIVELIST, so espresso can calculate the difference.
* Use --print-installation-architecture instead of --print-architecture
[ LaMont Jones ] [ LaMont Jones ]
* umount /var/{run,lock} * umount /var/{run,lock}

26
livecd.sh
View File

@ -50,7 +50,7 @@ export TTY=unknown
export TERM=vt100 export TERM=vt100
SRCMIRROR=http://archive.ubuntu.com/ubuntu SRCMIRROR=http://archive.ubuntu.com/ubuntu
COMP="main restricted" COMP="main restricted"
ARCH=$(dpkg --print-architecture) ARCH=$(dpkg --print-installation-architecture)
case $ARCH in case $ARCH in
i386|powerpc|amd64) i386|powerpc|amd64)
USERMIRROR=http://archive.ubuntu.com/ubuntu USERMIRROR=http://archive.ubuntu.com/ubuntu
@ -134,19 +134,20 @@ Flags: seen
case "$FS" in case "$FS" in
ubuntu) ubuntu)
LIST="$LIST ubuntu-base ubuntu-desktop ubuntu-live" LIST="$LIST ubuntu-base ubuntu-desktop"
LIST="$LIST xresprobe laptop-detect casper" LIVELIST="ubuntu-live xresprobe laptop-detect casper"
;; ;;
kubuntu) kubuntu)
LIST="$LIST ubuntu-base kubuntu-desktop kubuntu-live" LIST="$LIST ubuntu-base kubuntu-desktop"
LIST="$LIST xresprobe laptop-detect casper" LIVELIST="kubuntu-live xresprobe laptop-detect casper"
;; ;;
edubuntu) edubuntu)
LIST="$LIST ubuntu-base edubuntu-desktop edubuntu-live" LIST="$LIST ubuntu-base edubuntu-desktop"
LIST="$LIST xresprobe laptop-detect casper" LIVELIST="edubuntu-live xresprobe laptop-detect casper"
;; ;;
base) base)
LIST="$LIST ubuntu-base casper" LIST="$LIST ubuntu-base"
LIVELIST="casper"
;; ;;
tocd) tocd)
LIST="$LIST ubuntu-base" LIST="$LIST ubuntu-base"
@ -169,7 +170,8 @@ Flags: seen
exit 1 exit 1
fi fi
[ -d "$tocdtmp" ] && rm -rf "$tocdtmp" [ -d "$tocdtmp" ] && rm -rf "$tocdtmp"
LIST="$LIST $tocddesktop $tocdlive" LIST="$LIST $tocddesktop"
LIVELIST="$tocdlive casper"
esac esac
dpkg -l livecd-rootfs # get our version # in the log. dpkg -l livecd-rootfs # get our version # in the log.
@ -233,6 +235,11 @@ link_in_boot = no
echo deb $MIRROR $STE ${COMP} > ${ROOT}etc/apt/sources.list echo deb $MIRROR $STE ${COMP} > ${ROOT}etc/apt/sources.list
chroot $ROOT apt-get update chroot $ROOT apt-get update
chroot $ROOT apt-get -y install $LIST </dev/null chroot $ROOT apt-get -y install $LIST </dev/null
chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \
> livecd.${FS}.manifest-desktop
chroot $ROOT apt-get -y install $LIVELIST </dev/null
chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \
> livecd.${FS}.manifest
kill_users kill_users
chroot $ROOT /etc/cron.daily/slocate || true chroot $ROOT /etc/cron.daily/slocate || true
@ -279,7 +286,6 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP}
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 fi
chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' > livecd.${FS}.manifest
KVERS=`chroot ${ROOT} dpkg -l linux-image-2\*|grep ^i|awk '{print $2}'|sed 's/linux-image-//'` KVERS=`chroot ${ROOT} dpkg -l linux-image-2\*|grep ^i|awk '{print $2}'|sed 's/linux-image-//'`
for KVER in ${KVERS}; do for KVER in ${KVERS}; do
SUBARCH="${KVER#*-*-}" SUBARCH="${KVER#*-*-}"