Merge lp:~rsalveti/ubuntu/maverick/jasper-initramfs/swap-file-fix-627201 into lp:ubuntu/maverick/jasper-initramfs

[Ricardo Salveti]

Re-enabling swapfile generation.

Using the same code as before, as we're unable to use a sparse file for swap (swapon: Skipping file /SWAP.swap - it appears to have holes).

The bad thing is that the first boot now takes more 3 minutes to finish.

This change is important for all omap related boards (as we're still using ES1 for OMAP 4).

[lp:~rsalveti/ubuntu/maverick/jasper-initramfs/swap-file-fix-627201]

15. By Ricardo Salveti on 2010-09-03

Add correct mem argument for Panda ES2 (for 1gb) (LP: #629269)

16. By Oliver Grawert on 2010-09-07

drop the hack we needed with the beta kernel package, usb0 comes up fine
now and can be handled by NetworkManager again.

17. By Oliver Grawert on 2010-09-09

only use 768M on the panda yet, until bug 633227 is fixed

18. By Oliver Grawert on 2010-09-10

the second mem= arg needs an M too in the value (blind me, gah)

19. By Oliver Grawert on 2010-09-14

* re-enable swap file creation during first boot (LP: #627201)
* redirect output of mount calls in jasper_growroot to logfile
* change text about resizing time, it is a lot faster than 10min nowadays
* add more info to swap creation text

20. By Ricardo Salveti on 2010-09-15

fixing swap file creation, as it can't use a sparse file (LP: #627201)

Unmerged revisions

20. By Ricardo Salveti on 2010-09-15

fixing swap file creation, as it can't use a sparse file (LP: #627201)

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-14 19:00:43 +0000
+++ debian/changelog	2010-09-15 15:45:59 +0000
@@ -1,3 +1,9 @@
+jasper-initramfs (0.21) maverick; urgency=low
+
+  * fixing swap file creation, as it can't use a sparse file (LP: #627201)
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Wed, 15 Sep 2010 11:45:09 -0300
+
 jasper-initramfs (0.20) maverick; urgency=low
 
   * re-enable swap file creation during first boot (LP: #627201)

=== modified file 'scripts/local-bottom/jasper_setup'
--- scripts/local-bottom/jasper_setup	2010-09-14 19:00:43 +0000
+++ scripts/local-bottom/jasper_setup	2010-09-15 15:45:59 +0000
@@ -44,7 +44,7 @@
 fi
 echo "setting up swap, this will take a moment ..."
 if ! grep -q swap /root/etc/fstab; then
-    dd if=/dev/zero of=${DIR}/root/SWAP.swap bs=512 count=0 seek=1048576 >>$LOGFILE 2>&1
+    dd if=/dev/zero of=${DIR}/root/SWAP.swap bs=1048576 count=512 >>$LOGFILE 2>&1
     mkswap /root/SWAP.swap >>$LOGFILE 2>&1
     echo "/SWAP.swap  none  swap  sw  0 0" >>/root/etc/fstab
 fi