mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-03-11 11:21:11 +00:00
Import patches-unapplied version 2.46 to ubuntu/precise
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:
parent
2bec67407a
commit
f901b5d68e
@ -169,6 +169,7 @@ for STE in $SUITES; do
|
||||
done
|
||||
|
||||
for f in ${PUBDIR}${NOW}/livecd.*.cloop-*; do
|
||||
if [ -f ${f} ]; then
|
||||
target=${f%-*}
|
||||
if [ ! -f ${target} ]; then
|
||||
for fsbs in 4096:4096 1024:65536; do
|
||||
@ -182,6 +183,7 @@ for STE in $SUITES; do
|
||||
ln -sf ${best##*/} ${target}
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
done
|
||||
else
|
||||
exit 1
|
||||
|
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -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
|
||||
|
||||
* Change default suite to precise (better late than never?)
|
||||
|
@ -187,13 +187,9 @@ case $PROJECT in
|
||||
;;
|
||||
esac
|
||||
|
||||
case $SUBPROJECT in
|
||||
wubi)
|
||||
;;
|
||||
*)
|
||||
if [ "$PREINSTALLED" = "true" ]; then
|
||||
add_task live "$LIVE_TASK"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
case $PROJECT in
|
||||
ubuntu-dvd)
|
||||
|
Loading…
x
Reference in New Issue
Block a user