merge lunge

diff --git a/README.approx b/README.approx
index 512b375550039b3ebba4e29bf421ac2521efb6b2..80ef97ccffb52a38664e4df1f011615e21ae9035 100644 (file)
--- a/README.approx
+++ b/README.approx
@@ -17,11 +17,11 @@ security        http://security.debian.org/
        % sudo /etc/init.d/approx restart
 
 4.  follow README, but during the creation of the root filesystem, add
-the --mirror option, like this:
+the --local-apt-mirror option, like this:
 
         sudo ./initchroot.sh \
             --package-list kde.packages \
-            --local-apt-mirror "deb http://localhost:9999/debian lenny main contrib non-free
+            --local-apt-mirror \
+"deb http://localhost:9999/debian lenny main contrib non-free
 deb http://localhost:9999/security lenny/updates main contrib non-free" \
             kde.root
-

diff --git a/initchroot.sh b/initchroot.sh
index b9ee4654a772fe55cb57aa39198838482371312b..706414a6b277ac6781b6c66d489361b9b35e1316 100755 (executable)
--- a/initchroot.sh
+++ b/initchroot.sh
@@ -229,8 +229,7 @@ rm -rf ${ROOT_DIR}/home/*;  # i have no idea what's adding this crap...
 echo "${DEFUSER} ALL=(ALL) NOPASSWD: ALL" >> ${ROOT_DIR}/etc/sudoers
 
 # add local network interface
-cat >>${ROOT_DIR}/etc/network/interfaces<<EOF
-
+cat <<EOF >> ${ROOT_DIR}/etc/network/interfaces
 auto lo
 iface lo inet loopback
 EOF

diff --git a/mkjffs2.sh b/mkjffs2.sh
index da53633e06ee37c9dd0997f666d4a8c3e97eb44b..b67dde95d4a784cbe99ca970a5cce243eafc14d2 100755 (executable)
--- a/mkjffs2.sh
+++ b/mkjffs2.sh
@@ -16,6 +16,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+# see the update-nand format definition
+# http://wiki.laptop.org/go/OFW_NAND_FLASH_Updater
+
 . functions.sh
 
 usage()