Ubuntu CD Images

Merge lp:~jr/ubuntu-cdimage/kubuntu-quantal into lp:~cjwatson/ubuntu-cdimage/mainline

  1. kubuntu-quantal
  2. Merge into mainline
Proposed by Jonathan Riddell
Status: Merged
Merged at revision: 898
Proposed branch: lp:~jr/ubuntu-cdimage/kubuntu-quantal
Merge into: lp:~cjwatson/ubuntu-cdimage/mainline
Diff against target: 27 lines (+5/-1)
2 files modified
bin/publish-daily (+5/-0)
etc/crontab (+0/-1)
To merge this branch: bzr merge lp:~jr/ubuntu-cdimage/kubuntu-quantal
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+109612@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/publish-daily'
2--- bin/publish-daily 2012-05-18 15:57:03 +0000
3+++ bin/publish-daily 2012-06-11 11:33:28 +0000
4@@ -127,6 +127,11 @@
5 SIZELIMIT=4700372992
6 fi
7
8+ # Kubuntu limit of 1GB [quantal]
9+ if [ "$PROJECT" = kubuntu ]; then
10+ SIZELIMIT=1000000000
11+ fi
12+
13 if [ -e "$CDOUT/$arch/$DIST-$TYPE-$arch.raw" ]; then
14 echo "Publishing $arch ..."
15 mkdir -p "$PUBLISH"
16
17=== modified file 'etc/crontab'
18--- etc/crontab 2011-04-27 10:51:58 +0000
19+++ etc/crontab 2012-06-11 11:33:28 +0000
20@@ -5,7 +5,6 @@
21 31 7 * * * for-project ubuntu cron.daily; for-project ubuntu cron.daily-live
22 17 12 * * 2,6 for-project ubuntu cron.dvd
23 14 5 * * * for-project kubuntu cron.daily; for-project kubuntu cron.daily-live
24-47 20 * * 1,5 for-project kubuntu cron.dvd
25 44 0 * * * for-project edubuntu cron.dvd
26 55 9 * * * for-project xubuntu cron.daily; for-project xubuntu cron.daily-live
27 29 6 * * * for-project ubuntu-server cron.daily

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: