Merge lp:~rsalveti/ubuntu/maverick/jasper-initramfs/fix-629269 into lp:ubuntu/maverick/jasper-initramfs

[Ricardo Salveti]

Changing boot args to use 1gb for Panda ES2.

Aug 26 14:52:16 <rsalveti> robclark: what are the boot args you're using for es2?
Aug 26 14:52:28 <rsalveti> I interested at the mem argument
Aug 26 14:52:50 <rsalveti> do we need to let any free chunk available?
Aug 26 15:20:48 <robclark> rsalveti: root=/dev/mmcblk0p2 rootwait rw mem=460M@0x80000000 mem=512M@0xA0000000 console=ttyO2,115200n8 vram=8M omapfb.vram=0:8M
Aug 26 15:21:58 <rsalveti> robclark: hm, ok, and who uses the other free megabytes between 460 and 512?
Aug 26 15:22:28 <robclark> rsalveti: for ducati
Aug 26 15:22:58 <robclark> if you aren't using the hw accelerated video codecs, then you don't need it
Aug 26 15:23:45 <rsalveti> robclark: hm, ok, makes sense
Aug 26 15:23:46 <robclark> (and some point, in the next release or two, they will start dynamically allocating the memory for coprocessors.. but not sure when that will be exactly)
Aug 26 15:23:47 <rsalveti> thanks :-)

Unmerged revisions

70. By Ricardo Salveti on 2010-09-03

releasing version 0.16

69. By Ricardo Salveti on 2010-09-03

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

68. By Oliver Grawert on 2010-08-27

releasing version 0.15

67. By Oliver Grawert on 2010-08-27

add a hack to work around bug 625108 during maverick beta until the kernel is fixed

66. By Oliver Grawert on 2010-08-26

releasing version 0.14

65. By Oliver Grawert on 2010-08-26

jasper_growroot: do not exit if fsck exits with 1 (i.e. if last mount time doesnt match RTC)

64. By Oliver Grawert on 2010-07-18

releasing version 0.13

63. By Oliver Grawert on 2010-07-18

update changelog

62. By Oliver Grawert on 2010-07-18

jasper_setup: switch / mount to noatime

61. By Oliver Grawert on 2010-07-18

jasper_growroot: small fixes, jasper_setup: disable swap file creation (temporary), add sysctl.d file to switch kernel to less disk writes, default to noop elevator on kernel cmdline, add more output (temporary)

=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2010-09-03 06:14:40 +0000
@@ -0,0 +1,150 @@
+jasper-initramfs (0.16) maverick; urgency=low
+
+  * Add correct mem argument for Panda ES2 (for 1gb) (LP: #629269)
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Fri, 03 Sep 2010 02:40:40 -0300
+
+jasper-initramfs (0.15) maverick; urgency=low
+
+  * add a hack to work around bug 625108 during maverick beta until the kernel
+    is fixed
+
+ -- Oliver Grawert <[e-mail]>  Fri, 27 Aug 2010 12:50:06 +0200
+
+jasper-initramfs (0.14) maverick; urgency=low
+
+  * do not exit before resizing even if e2fsck found wrong last mount time etc.
+
+ -- Oliver Grawert <[e-mail]>  Thu, 26 Aug 2010 13:54:17 +0200
+
+jasper-initramfs (0.13) maverick; urgency=low
+
+  * jasper_growroot:
+   - strip parentheses from resize2fs output
+   - add proper percentage output for each single pass instead of plain dots so
+     the user gets more details about the resize progress.
+   - change info string and bind time to SD size (10min per 4G)
+  * depend on bc for percentage calculation
+  * copy bc in the jasper hook
+  * jasper_setup:
+   - run gdm-set-default-session chrooted
+   - add /etc/sysctl.d/30-jasper-root-on-sd.conf file with options to reduce
+     disk access.
+   - temporary disable swapfile creation.
+   - default to noop elevator on cmdline for a test
+   - add more debug output (temporary)
+   - mount / with noatime
+  * reboot if the filesystem was resized
+
+ -- Oliver Grawert <[e-mail]>  Sun, 18 Jul 2010 09:02:16 +0200
+
+jasper-initramfs (0.12) maverick; urgency=low
+
+  * default to une-efl session if it is installed in the root filesystem
+  * add progress reporting to resize2fs output
+
+ -- Oliver Grawert <[e-mail]>  Wed, 14 Jul 2010 14:01:07 +0200
+
+jasper-initramfs (0.11) maverick; urgency=low
+
+  * jasper_setup: create /root/boot/boot.script to make user editing of
+    cmdline options easier, users only need to edit this file and run
+    flash-kernel on the installed system now.
+  * change upstream branch to lp:jasper-initramfs to match the new project
+    name
+
+ -- Oliver Grawert <[e-mail]>  Fri, 09 Jul 2010 13:57:37 +0200
+
+jasper-initramfs (0.10) maverick; urgency=low
+
+  [ Oliver Grawert ]
+  * jasper_setup:
+   - fix whitespace
+   - add proper logging and better logfile handling
+   - fix typo in flash-kernel.conf creation
+   - add quiet and splash to default cmdline
+   - set board specific cmdline options in boot.scr for panda and beagleboard
+
+  [ Alexander Sack ]
+  * jasper_setup: improve match for proc line from /etc/fstab
+
+ -- Oliver Grawert <[e-mail]>  Tue, 06 Jul 2010 13:56:43 +0200
+
+jasper-initramfs (0.9) maverick; urgency=low
+
+  [ Alexander Sack ]
+  * jasper_setup: allow rootfs to live on any device; don't assume its on mmc device
+    if root= kernel command line already has a UUID= id there
+
+  [ Oliver Grawert ]
+  * jasper_setup: add swap file creation if not existing in fstab yet with a
+    default value of 256M
+
+ -- Oliver Grawert <[e-mail]>  Thu, 01 Jul 2010 23:28:15 +0200
+
+jasper-initramfs (0.7) maverick; urgency=low
+
+  * jasper_growroot: dont call sync with full path in write_vfat, that makes
+    the script choke
+
+ -- Oliver Grawert <[e-mail]>  Wed, 30 Jun 2010 20:27:28 +0200
+
+jasper-initramfs (0.6) maverick; urgency=low
+
+   * jasper_setup:
+    - adjust variable handling
+    - create new boot.scr with root=UUID=... entry
+    - copy log to /var/log
+    - write flash-kernel.conf
+   * jasper_growroot:
+    - add detection of rootdevice from cmdline
+    - use DOS compatibility in sfdisk call to make sure vfat stays bootable
+    - give a more precise time to the user in the script output
+    - add caching and re-formatting of the vfat partition with the new
+      CHS geometry of the SD card so we can be sure we are still able to boot
+   * debian/control: drop dep on mtools, add dep on uboot-mkimage
+
+ -- Oliver Grawert <[e-mail]>  Tue, 22 Jun 2010 17:39:18 +0200
+
+jasper-initramfs (0.5) maverick; urgency=low
+
+  * jasper_setup: fix fstab creation
+  * jasper_growroot:
+   - add e2fsck call (LP: #594756)
+   - use fdisk to get the blocksize of first partition
+   - move removal of fake mtab file to end of the script
+   - rework logging to /dev/.initramfs/jasper.log
+   - rework partitioning code
+   - fix SIZE detection
+
+ -- Oliver Grawert <[e-mail]>  Fri, 18 Jun 2010 15:59:38 +0200
+
+jasper-initramfs (0.4) maverick; urgency=low
+
+  * make the package arch: all ... no need to build it separately
+  * be more agressive with the trigger
+  * move debian/install and debian/triggers to package specific namespace
+
+ -- Oliver Grawert <[e-mail]>  Sun, 13 Jun 2010 17:11:12 +0200
+
+jasper-initramfs (0.3) maverick; urgency=low
+
+  * add update-initramfs trigger to make sure the scripts end up where they
+    beling
+
+ -- Oliver Grawert <[e-mail]>  Sun, 13 Jun 2010 16:09:11 +0200
+
+jasper-initramfs (0.2) maverick; urgency=low
+
+  * jasper_growroot: use fake mtab in initramfs to please resize2fs, drop
+    fsck, we need to do that at image build time, change UUID generation code.
+  * jasper_setup: use ext3 filesystem in fstab, remount /root rw for write
+    operations
+
+ -- Oliver Grawert <[e-mail]>  Thu, 10 Jun 2010 07:28:25 +0200
+
+jasper-initramfs (0.1) maverick; urgency=low
+
+  * Initial release.
+
+ -- Oliver Grawert <[e-mail]>  Fri, 04 Jun 2010 18:29:17 +0200

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2010-09-03 06:14:40 +0000
@@ -0,0 +1,1 @@
+7

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2010-09-03 06:14:40 +0000
@@ -0,0 +1,22 @@
+Source: jasper-initramfs
+Section: misc
+Priority: optional
+Maintainer: Oliver Grawert <[e-mail]>
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.8.4
+Vcs-Bzr: lp:jasper-initramfs
+
+Package: jasper
+Architecture: all
+Section: misc
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, initramfs-tools, busybox-initramfs, util-linux (>= 2.17.2-0), uuid-runtime, e2fsprogs (>= 1.41.11-1), coreutils (>= 7.4-2), oem-config, dosfstools, uboot-mkimage, bc
+Description: Configure a preinstalled ext2/3 system image
+ Jasper is a tool to configure preinstalled ext2/3 images that were
+ created using the ubuntu infrastructure from the initramfs.
+ Such as armel omap3/4 images in Ubuntu 10.10 and beyond.
+ .
+ It grows the system partition of a preinstalled ext2/3 image to the
+ full size of the SD card, configures fstab, loopback networking, adds
+ the UUID to the kernel cmdline and properly sets up flash-kernel for
+ the kernel package post installation scripts.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2010-09-03 06:14:40 +0000
@@ -0,0 +1,24 @@
+Author: Oliver Grawert <[e-mail]>
+
+Copyright:
+
+License (everything else):
+
+	Copyright (C) 2010 Canonical Ltd. <http://www.canonical.com/>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian and Ubuntu systems, the complete text of the GNU General Public License
+can be found in /usr/share/common-licenses/GPL file.

=== added file 'debian/jasper.install'
--- debian/jasper.install	1970-01-01 00:00:00 +0000
+++ debian/jasper.install	2010-09-03 06:14:40 +0000
@@ -0,0 +1,2 @@
+scripts usr/share/initramfs-tools/
+hooks usr/share/initramfs-tools/

=== added file 'debian/jasper.triggers'
--- debian/jasper.triggers	1970-01-01 00:00:00 +0000
+++ debian/jasper.triggers	2010-09-03 06:14:40 +0000
@@ -0,0 +1,1 @@
+activate update-initramfs

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2010-09-03 06:14:40 +0000
@@ -0,0 +1,3 @@
+#! /usr/bin/make -f
+%:
+	dh $@

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2010-09-03 06:14:40 +0000
@@ -0,0 +1,1 @@
+3.0 (native)

=== added directory 'hooks'
=== renamed directory 'hooks' => 'hooks.moved'
=== added file 'hooks/jasper'
--- hooks/jasper	1970-01-01 00:00:00 +0000
+++ hooks/jasper	2010-09-03 06:14:40 +0000
@@ -0,0 +1,30 @@
+#!/bin/sh -e
+# initramfs hook for jasper
+
+PREREQ=""
+
+# Output pre-requisites
+prereqs()
+{
+        echo "$PREREQ"
+}
+
+case "$1" in
+    prereqs)
+        prereqs
+        exit 0
+        ;;
+esac
+
+. /usr/share/initramfs-tools/hook-functions
+
+copy_exec /sbin/resize2fs /sbin
+copy_exec /sbin/e2fsck /sbin
+copy_exec /sbin/tune2fs /sbin
+copy_exec /sbin/sfdisk /sbin
+copy_exec /sbin/fdisk /sbin
+copy_exec /usr/bin/uuidgen /bin
+copy_exec /bin/sync /bin
+copy_exec /sbin/mkdosfs /sbin
+copy_exec /sbin/mkswap /sbin
+copy_exec /usr/bin/bc /bin

=== added directory 'scripts'
=== renamed directory 'scripts' => 'scripts.moved'
=== added directory 'scripts/local-bottom'
=== added file 'scripts/local-bottom/jasper_setup'
--- scripts/local-bottom/jasper_setup	1970-01-01 00:00:00 +0000
+++ scripts/local-bottom/jasper_setup	2010-09-03 06:14:40 +0000
@@ -0,0 +1,127 @@
+#!/bin/sh -e
+
+PREREQ=""
+
+# Output pre-requisites
+prereqs()
+{
+        echo "$PREREQ"
+}
+
+case "$1" in
+    prereqs)
+        prereqs
+        exit 0
+        ;;
+esac
+
+LOGFILE=/dev/.initramfs/jasper.log
+# If we are already confiugured we dont want to run again
+[ -e /root/etc/flash-kernel.conf ] && exit 0
+
+machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')
+
+if echo "$root" | grep -q '^UUID='; then
+  VOLID=$root
+else
+  VOLID=$(blkid |grep mmcblk0p2|awk '{print $2}'|tr -d [\"])
+fi
+
+UBOOT_PART="/dev/mmcblk0p1"
+TMPDIR="/dev/.initramfs/jasper-tmp"
+BOOT_SCRIPT="/boot/boot.script"
+
+# make sure FS is writable
+mount -o remount,rw /root
+
+# create fstab in /root, we only support ext3 partitions atm
+echo "setting up fstab"
+if ! cat /root/etc/fstab | grep -v '^#' | awk '{print $3}' | grep -q ^proc; then
+  echo "proc /proc proc defaults 0 0" >>/root/etc/fstab
+fi
+if ! grep -q ${VOLID} /root/etc/fstab; then
+  echo "${VOLID} / ext3 defaults,noatime,errors=remount-ro 0 1" >>/root/etc/fstab
+fi
+#echo "setting up swap"
+#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
+#    mkswap /root/SWAP.swap >>$LOGFILE 2>&1
+#    echo "/SWAP.swap  none  swap  sw  0 0" >>/root/etc/fstab
+#fi
+
+echo "setting up loopback networking"
+# create loopback networking device in /root
+echo "auto lo" >/root/etc/network/interfaces
+echo "iface lo inet loopback" >>/root/etc/network/interfaces
+
+# hack to prevent bug #625108 in maverick beta until the kernel is fixed
+echo "auto usb0" >>/root/etc/network/interfaces
+echo "iface usb0 inet dhcp" >>/root/etc/network/interfaces
+
+echo "enabling oem-config"
+# switch oem-config on
+mkdir -p /root/var/lib/oem-config
+touch /root/var/lib/oem-config/run
+
+echo "writing flash-kernel.conf"
+# create flash-kernel setup
+echo "UBOOT_PART=${UBOOT_PART}" >/root/etc/flash-kernel.conf
+echo "ROOT=${VOLID}" >>/root/etc/flash-kernel.conf
+
+# TODO get EDID data and pick reasonable resolution for cmdline
+
+# create new boot.scr file with root=${VOLID}
+case "$machine" in
+        "OMAP3 Beagle Board")
+            BOARD_OPTS="elevator=noop vram=12M omapfb.mode=dvi:1280x720MR-16@60"
+        ;;
+        "OMAP4430 Panda Board")
+            BOARD_OPTS="elevator=noop vram=32M mem=460M@0x80000000 mem=512M@0xA0000000"
+        ;;
+esac
+
+echo "creating boot.script"
+cat >"/root${BOOT_SCRIPT}" <<EOF
+        fatload mmc 0:1 0x80000000 uImage
+        fatload mmc 0:1 0x81600000 uInitrd
+        setenv bootargs quiet splash ro ${BOARD_OPTS} root=${VOLID} fixrtc
+        bootm 0x80000000 0x81600000
+EOF
+mkdir -p ${TMPDIR}
+mount ${UBOOT_PART} ${TMPDIR}
+/root/usr/bin/mkimage -A arm -T script -C none -n "Ubuntu boot script" -d /root${BOOT_SCRIPT} ${TMPDIR}/boot.scr >>$LOGFILE 2>&1
+umount ${TMPDIR}
+rm -rf ${TMPDIR}
+
+echo "adding SD card optimizations"
+cat >"/root/etc/sysctl.d/30-jasper-root-on-sd.conf" <<EOF
+# The values below try to reduce disk writes, they were put in place
+# by the jasper-initramfs package during first boot of this computer.
+# If you encounter problems due to the settings please file a bug
+# against the jasper-initramfs ubuntu package.
+vm.swappiness = 0
+vm.vfs_cache_pressure=50
+vm.dirty_background_ratio = 20
+vm.dirty_expire_centisecs = 0
+vm.dirty_ratio = 80
+vm.dirty_writeback_centisecs = 6000
+EOF
+
+echo "setting default session"
+# default to 2D une session if it is installed
+if [ -e /root/usr/share/xsessions/une-efl.desktop ] && [ -e /root/usr/lib/gdm/gdm-set-default-session ];then
+    chroot /root /usr/lib/gdm/gdm-set-default-session une-efl >>$LOGFILE 2>&1 || true
+fi
+
+# move jasper.log to root filesystem
+mv $LOGFILE /root/var/log/
+
+# remount readonly
+mount -o remount,ro /root
+
+echo "reboot check"
+if [ -e /dev/.initramfs/jasper-reboot ];then
+    echo "Rebooting into configuration session ..."
+    sleep 1
+    reboot
+fi

=== added directory 'scripts/local-premount'
=== added file 'scripts/local-premount/jasper_growroot'
--- scripts/local-premount/jasper_growroot	1970-01-01 00:00:00 +0000
+++ scripts/local-premount/jasper_growroot	2010-09-03 06:14:40 +0000
@@ -0,0 +1,146 @@
+#!/bin/sh -e
+
+PREREQ=""
+
+# Output pre-requisites
+prereqs()
+{
+        echo "$PREREQ"
+}
+
+case "$1" in
+    prereqs)
+        prereqs
+        exit 0
+        ;;
+esac
+
+DISK=mmcblk0
+SEP="p"
+
+LOG=/dev/.initramfs/jasper.log
+CACHE=/dev/.initramfs/jasper-vfat
+
+touch ${LOG}
+mkdir -p ${CACHE}
+
+BOOTPATH=""
+PARTITION=""
+
+# we only handle mmc and sdX disk types atm if a UUID is already set we dont want
+# to do any action since we assume the system was configured before
+[ -z "`grep root=UUID /proc/cmdline`" ] || exit 0
+for arg in $(cat /proc/cmdline)
+do
+    case $arg in
+        root=*)
+            BOOTPATH=${arg#root=}
+            PARTITION=${BOOTPATH#/dev/}
+            case $PARTITION in
+                mmcblk*)
+                    DISK=$(echo ${PARTITION}|sed -e 's/p[0-9]*$//')
+                    ;;
+                sd*)
+                    DISK=$(echo ${PARTITION}|sed -e 's/[0-9]*$//')
+                    SEP=""
+                    ;;
+                *)
+                    echo "E: Jasper error, can not hanlde this disk type"
+                    exit 1
+                    ;;
+            esac
+            ;;
+    esac
+done
+
+# We save the vfat contents because we adjust the CHS gemoetry to match the SD card,
+# MLO/u-boot wont work without re-formatting the vfat with the new values
+cache_vfat()
+{
+    mount -t tmpfs -o mode=0755 none ${CACHE}
+    mkdir -p /mnt
+    mount -t vfat /dev/${DISK}${SEP}1 /mnt
+    cp -a /mnt/* ${CACHE}/
+    umount /dev/${DISK}${SEP}1
+}
+
+# Format the new vfat and write the cached content back in the right order
+write_vfat()
+{
+    # TODO: find a better LABEL and add it to list of hidden partitions in udisk
+    /sbin/mkdosfs -n "SERVICEV001" -F 32 /dev/${DISK}${SEP}1
+    mount /dev/${DISK}${SEP}1 /mnt
+    for file in MLO boot.scr u-boot.bin uImage uInitrd; do
+        cp ${CACHE}/$file /mnt/${file}
+        sync
+    done
+    umount ${CACHE}
+    umount /mnt
+}
+
+# The actual resizing function
+resize_partitions()
+{
+    # Get size in blocks of first partition and cylinder count
+    SIZE_P1=`LANG=C /sbin/fdisk -l /dev/${DISK} | grep ${DISK}${SEP}1 | awk '{print $4}'`
+    DISKSIZE=`LANG=C /sbin/fdisk -l /dev/${DISK} | grep Disk | awk '{print $5}' | tr -d '\n'`
+    CYLS=$(($DISKSIZE/255/63/512))
+    sync
+    # Enlarge the OS partition to fill the rest of the disk, we need to maintain
+    # the new CHS geometry for the bootloader
+    /sbin/sfdisk -H 255 -S 63 -C ${CYLS} --no-reread -D -q /dev/${DISK} <<EOF >>${LOG} 2>&1
+,$SIZE_P1,c,*
+,,,-
+EOF
+}
+
+# Most functions below want an mtab file to check if the disk is mounted
+ln -s /proc/mounts /etc/mtab >>${LOG} 2>&1
+
+echo "Caching vfat content in ${CACHE} ..." >>${LOG}
+cache_vfat >>${LOG} 2>&1
+
+echo "Resizing root partition ..." >>${LOG}
+resize_partitions
+
+echo "Re-writing vfat partition ..." >>${LOG}
+write_vfat >>${LOG} 2>&1
+
+# Give some info to the user TODO: create plymouth output
+echo "Resizing root filesystem. Please wait, this will take about ten minutes per 4G ..."
+echo "Resizing root filesystem ..." >>${LOG}
+# little workaround for wrong clocks
+mount /dev/${DISK}${SEP}2 /root
+umount /root
+
+printf "Checking filesystem before resizing..."
+/sbin/e2fsck -fy /dev/${DISK}${SEP}2 >>${LOG} 2>&1 || true
+echo " Done."
+pass=1
+iter=0
+LANG=C /sbin/resize2fs -p /dev/${DISK}${SEP}2 2>&1 | while read -n 1 input; do
+    char=$(echo $input|sed 's/[)(]//')
+    if [ "${char}" = "X" ];then
+        if [ "${iter}" = "100.0" ];then
+            iter=0
+            pass=$(($pass+1))
+            echo >>${LOG}
+        fi  
+        iter=$(echo $iter+2.5|bc)
+        printf "\rResizing, pass: %i [%3.0f/100]" $pass $iter
+    fi  
+    if [ -z "${char}" ]; then
+        echo -n " " >>${LOG}
+    else
+        echo -n "${char}" >>${LOG}
+    fi  
+done
+echo >>${LOG}
+echo
+echo 1>/dev/.initramfs/jasper-reboot
+
+# Set a new UUID to make sure we're unique in the world
+/sbin/tune2fs -U $(uuidgen) /dev/${DISK}${SEP}2 >>${LOG} 2>&1
+
+rm /etc/mtab
+rm -rf ${CACHE}