* DistUpgrade/Changelog, README, TODO:

  - documentation updated
* DistUpgrade/cdromupgrade:
  - simple wrapper to be put onto the CD

4 files changed, 40 insertions, 33 deletions

diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog
index b282caa1..b07e9721 100644
--- a/DistUpgrade/Changelog
+++ b/DistUpgrade/Changelog
@@ -6,7 +6,7 @@
 	- moved the logging into the /var/log/dist-upgrade/ dir
 	- change the obsoletes calculation when run without network and
           consider demotions as obsoletes then (because we can't really
-	  use the "downloadable" hint without network)
+	  use the "pkg.downloadable" hint without network)
 2006-08-18: 
 	- sort the demoted software list
 2006-07-31:
diff --git a/DistUpgrade/README b/DistUpgrade/README
index 28684985..d519ef11 100644
--- a/DistUpgrade/README
+++ b/DistUpgrade/README
@@ -1,3 +1,17 @@
+General
+-------
+
+The dist-upgrader is designed to make upgrades for ubuntu (or similar
+distributions) easy and painless. It supports both network mode and
+cdrom upgrades. The cdromupgrade will ask if it should use the network
+or not. There is a wrapper script "cdromugprade" (that assumes the
+file of the upgrade life in CDROM_ROOT/upgrade/) that can be put onto
+the CD and it will support upgrades directly from the CD.
+
+
+Configuration
+-------------
+
 The DistUpgrade.cfg format is based on the python ConfigParser.
 
 It supports the following sections:
diff --git a/DistUpgrade/TODO b/DistUpgrade/TODO
index fd29d52d..e420d56b 100644
--- a/DistUpgrade/TODO
+++ b/DistUpgrade/TODO
@@ -1,34 +1,22 @@
-MUSTFIX:
---------
-
-* debconf gnome dosn't work (can't connect to the session)
-  [ should be fixed with the bugfix on gksu ]
-* display a message that all applications should be closed for the 
-  dist-upgrade (and that strange things like a crashing panel can
-  happen)
-  [done in current dialog]
-* sources.list edit needs to add valid sources if all other sources
-  are commented out
-  (or for sources that can't be identified and rewrite ask the user
-   what to do by just s/breezy/dapper/g?)
-  [Done]
-* inform about commented out sources
-  [Done]
-* fix "no activity for 120s warning" being repeated every sec in the logs
-  [Done]
+CDROM:
+-----
+ * release notes display in CDROM mode
+ * if run from CDROM and we have network -> do a self update
+ * support dapper-commercial in sources.list rewriting
+ * after "no-network" dist-upgrade it is most likely that the system
+   is only half-upgraded and update-manager will not be able to do
+   the full upgrade. update-manager needs to be changed to support
+   full dist-upgrades (possible by just calling the dist-upgrader
+   in a special mode)
+
+Misc:
+-----
 
 * [fabbio]: we probably don't want to remove stuff that moved from main
   to universe (if the user has only main enabled this is considered 
   obsolete). It would also be nice inform about packages that went from
   main->universe. We could ship a list of demotions.
-* [kamion]: we could use debconf-frontend=dialog and then detect the ansi
-            seqence that clear the screen and open the terminal then 
-            -> trouble: vte does not give me the raw codes but only the
-                        text (as \n\n\n\n\n... for cls)
-* add "add cdrom" to the "Do upgrade?" screen? And recalc the download 
-  size again then :) ?
 * set bigger timeout than 120s?
-* make the sources.list rewrite even more robust (see launchpad #41023)
 
 breezy->dapper
 --------------
@@ -44,13 +32,8 @@ hoary->breezy
 
 general
 -------
-- CDROM upgrades !!!
-
-- whitelist removal (pattern? e.g. c102 -> c2a etc)?
-
-- check authentication and don't upgrade anything that is not
-  authenticated (maybe just comment unauthenticated stuff out?)
-
+- whitelist removal (pattern? e.g. c102 -> c2a etc) and not
+  display it?
 
 Robustness:
 -----------
diff --git a/DistUpgrade/cdromupgrade b/DistUpgrade/cdromupgrade
new file mode 100755
index 00000000..d33c56c1
--- /dev/null
+++ b/DistUpgrade/cdromupgrade
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# "cdromupgrade" is a shell script wrapper around the dist-upgrader
+# to make it possible to put it onto the top-level dir of a CD and
+# run it from there
+# 
+
+cddirname=${0%\/*}
+cd $cddirname/upgrade
+$cddirname/upgrade/dist-upgrade.py --cdrom $cddirname
\ No newline at end of file