Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-16 13:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Add GENERATE_ROOTFS_ONLY to support generating a single rootfs.

Browse Source 
* Add a test for SUBPROJECT when PROJECT comes to ubuntu-server.
This commit is contained in:
Gary.Wzl 2017-09-20 18:23:35 +08:00
commit 5355732bc8
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -1,8 +1,13 @@
livecd-rootfs (2.459) UNRELEASED; urgency=medium livecd-rootfs (2.459) UNRELEASED; urgency=medium
[ Steve Langasek ]
* Remove spurious call to 'sync'; we don't need to flush all disk caches * Remove spurious call to 'sync'; we don't need to flush all disk caches
on the system to cleanly unmount a partition. on the system to cleanly unmount a partition.
[ Gary Wang ]
* Add GENERATE_ROOTFS_ONLY to support generating a single rootfs.
* Add a test for SUBPROJECT when PROJECT comes to ubuntu-server.
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 19 Sep 2017 13:15:33 -0700 -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 19 Sep 2017 13:15:33 -0700
livecd-rootfs (2.458) artful; urgency=medium livecd-rootfs (2.458) artful; urgency=medium

10
live-build/auto/build
View File

@ -229,10 +229,16 @@ EOF
(cd chroot && find usr/share/doc -maxdepth 1 -type d | xargs du -s | sort -nr) (cd chroot && find usr/share/doc -maxdepth 1 -type d | xargs du -s | sort -nr)
echo END docdirs echo END docdirs
lb binary "$@" if [ -z "${GENERATE_ROOTFS_ONLY:-}" ]; then
touch binary.success lb binary "$@"
touch binary.success
fi
) 2>&1 | tee binary.log ) 2>&1 | tee binary.log
if [ ! -z "${GENERATE_ROOTFS_ONLY:-}" ] && [ "${GENERATE_ROOTFS_ONLY}" = 1 ]; then
exit 0
fi
# bash has trouble with the build.sh sourcing arrangement at the top of this # bash has trouble with the build.sh sourcing arrangement at the top of this
# file, so we use this cheap-and-cheerful approach rather than the more # file, so we use this cheap-and-cheerful approach rather than the more
# correct 'set -o pipefail'. # correct 'set -o pipefail'.

2
live-build/auto/config
View File

@ -757,7 +757,7 @@ EOF
;; ;;
esac esac
if [ $PROJECT = ubuntu-server ] && [ $SUBPROJECT != live ]; then if [ $PROJECT = ubuntu-server ] && [ ! -z "${SUBPROJECT:-}" ] && [ $SUBPROJECT != live ]; then
cat > config/hooks/100-remove-fstab.chroot <<EOF cat > config/hooks/100-remove-fstab.chroot <<EOF
#! /bin/sh #! /bin/sh
rm -f /etc/fstab rm -f /etc/fstab