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

Import patches-unapplied version 2.46 to ubuntu/precise

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 2bec67407ad8c4db36064d57bdb79da728a2c310

New changelog entries:
  * Guard legacy cloop code in a [ -f ], so it stops failing.
  * Don't add the LIVE_TASK for any PREINSTALLED images.
This commit is contained in:
Adam Conrad 2012-01-09 03:23:26 -07:00 committed by usd-importer
parent 2bec67407a
commit f901b5d68e
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
BuildLiveCD
View File

@ -36,7 +36,7 @@ LIVE_BUILD=false
UBUNTU_DEFAULTS_LOCALE="" UBUNTU_DEFAULTS_LOCALE=""
while getopts :A:s:r:d:f:pa:lu: name; do case $name in while getopts :A:s:r:d:f:pa:lu: name; do case $name in
A) ARCH="$OPTARG";; A) ARCH="$OPTARG";;
s) SUBARCH="$OPTARG";; s) SUBARCH="$OPTARG";;
r) SUBPROJECT="$OPTARG";; r) SUBPROJECT="$OPTARG";;
d) NEWSUITE="$OPTARG";; d) NEWSUITE="$OPTARG";;
@ -169,17 +169,19 @@ for STE in $SUITES; do
done done
for f in ${PUBDIR}${NOW}/livecd.*.cloop-*; do for f in ${PUBDIR}${NOW}/livecd.*.cloop-*; do
target=${f%-*} if [ -f ${f} ]; then
if [ ! -f ${target} ]; then target=${f%-*}
for fsbs in 4096:4096 1024:65536; do
if [ -f ${target}-${fsbs} ]; then
ln -sf ${target##*/}-${fsbs} ${target}
break
fi
done
if [ ! -f ${target} ]; then if [ ! -f ${target} ]; then
best=$(ls -ld ${target}-* | sort -k5,5n| awk '{print $NF; quit}') for fsbs in 4096:4096 1024:65536; do
ln -sf ${best##*/} ${target} if [ -f ${target}-${fsbs} ]; then
ln -sf ${target##*/}-${fsbs} ${target}
break
fi
done
if [ ! -f ${target} ]; then
best=$(ls -ld ${target}-* | sort -k5,5n| awk '{print $NF; quit}')
ln -sf ${best##*/} ${target}
fi
fi fi
fi fi
done done

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.46) precise; urgency=low
* Guard legacy cloop code in a [ -f ], so it stops failing.
* Don't add the LIVE_TASK for any PREINSTALLED images.
-- Adam Conrad <adconrad@ubuntu.com> Mon, 09 Jan 2012 03:23:26 -0700
livecd-rootfs (2.45) precise; urgency=low livecd-rootfs (2.45) precise; urgency=low
* Change default suite to precise (better late than never?) * Change default suite to precise (better late than never?)

10
live-build/auto/config
View File

@ -187,13 +187,9 @@ case $PROJECT in
;; ;;
esac esac
case $SUBPROJECT in if [ "$PREINSTALLED" = "true" ]; then
wubi) add_task live "$LIVE_TASK"
;; fi
*)
add_task live "$LIVE_TASK"
;;
esac
case $PROJECT in case $PROJECT in
ubuntu-dvd) ubuntu-dvd)