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

* Add a test for SUBPROJECT when PROJECT comes to ubuntu-server.

Browse Source 
* Use notations "0/1" instead of "false/true" as a value for GENERATE_ROOTFS_ONLY.
This commit is contained in:
Gary.Wzl 2017-09-20 18:15:16 +08:00
parent 8fc8c6dc00
commit 8a8d203743
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -1,6 +1,7 @@
livecd-rootfs (2.457ubuntu1) UNRELEASED; urgency=medium livecd-rootfs (2.458) artful; urgency=medium
* Add GENERATE_ROOTFS_ONLY to support generating a single rootfs. * Add GENERATE_ROOTFS_ONLY to support generating a single rootfs.
* Add a test for SUBPROJECT when PROJECT comes to ubuntu-server.
-- Gary Wang <gary.wang@canonical.com> Mon, 18 Sep 2017 09:51:04 +0800 -- Gary Wang <gary.wang@canonical.com> Mon, 18 Sep 2017 09:51:04 +0800

2
live-build/auto/build
View File

@ -235,7 +235,7 @@ EOF
fi fi
) 2>&1 | tee binary.log ) 2>&1 | tee binary.log
if [ ! -z "${GENERATE_ROOTFS_ONLY:-}" ] && [ "${GENERATE_ROOTFS_ONLY}" != "false" ]; then if [ ! -z "${GENERATE_ROOTFS_ONLY:-}" ] && [ "${GENERATE_ROOTFS_ONLY}" = 1 ]; then
exit 0 exit 0
fi fi

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