[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. cfc34db748f10d5525115758625bdd80663fbffa

[Steffen Moeller]

The following commit has been merged in the master branch:
commit cfc34db748f10d5525115758625bdd80663fbffa
Merge: 1cefa8f1064c80351cef09307b25bb274abd4e24 bc1bd90d647d31f90dce12e591cc5b1539558f4f
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Apr 18 13:52:30 2009 +0200

    Merge branch 'master' of ssh://moeller@git.debian.org/git/pkg-fso/files

diff --combined install.sh
index efa322c,bf7c204..181dfbb
--- a/install.sh
+++ b/install.sh
@@@ -76,7 -76,6 +76,7 @@@ MOUNT_PROC="
  
  # internal variables
  intern_instdir_already_present="" 
 +intern_no_partitioning=""
  
  # cdebootstrap options
  # with packages for a basic debian with network connectivity
@@@ -90,7 -89,7 +90,7 @@@ CDEBOOTSTRAP_EXCLUDE_PACKAGES=hell
  # With work around for some APT/aptitude bug (http://bugs.debian.org/435662)
  FSO_PACKAGES="matchbox-window-manager zhone fso-frameworkd fso-gpsd openmoko-panel-plugin dbus-x11 trayer fso-utils mtd-utils \
  xserver-xorg-video-fbdev xserver-xorg-input-tslib xterm xinit xfonts-base x11-xserver-utils \
- xserver-xorg-input-all- xserver-xorg-input-synaptics- xserver-xorg-input-wacom- xserver-xorg-video-all- xserver-xorg-video-v4l- xserver-xorg-video-voodoo- xserver-xorg-video-vga- xserver-xorg-video-vesa- xserver-xorg-video-tseng- xserver-xorg-video-trident- xserver-xorg-video-tga- xserver-xorg-video-tdfx- xserver-xorg-video-sisusb- xserver-xorg-video-sis- xserver-xorg-video-siliconmotion- xserver-xorg-video-savage- xserver-xorg-video-s3virge- xserver-xorg-video-s3- xserver-xorg-video-rendition- xserver-xorg-video-radeonhd- xserver-xorg-video-nv- xserver-xorg-video-nsc- xserver-xorg-video-neomagic- xserver-xorg-video-mga- xserver-xorg-video-imstt- xserver-xorg-video-i740- xserver-xorg-video-i128- xserver-xorg-video-glint- xserver-xorg-video-dummy- xserver-xorg-video-cyrix- xserver-xorg-video-chips- xserver-xorg-video-ati- xserver-xorg-video-radeon- xserver-xorg-video-mach64- xserver-xorg-video-r128- xserver-xorg-video-cirrus- xserver-xorg-video-ark- xserver-xorg-video-apm-"
+ xserver-xorg-input-all- xserver-xorg-input-synaptics- xserver-xorg-input-wacom- xserver-xorg-video-all- xserver-xorg-video-v4l- xserver-xorg-video-voodoo- xserver-xorg-video-vesa- xserver-xorg-video-tseng- xserver-xorg-video-trident- xserver-xorg-video-tga- xserver-xorg-video-tdfx- xserver-xorg-video-sisusb- xserver-xorg-video-sis- xserver-xorg-video-siliconmotion- xserver-xorg-video-savage- xserver-xorg-video-s3virge- xserver-xorg-video-s3- xserver-xorg-video-rendition- xserver-xorg-video-radeonhd- xserver-xorg-video-nv- xserver-xorg-video-nsc- xserver-xorg-video-neomagic- xserver-xorg-video-mga- xserver-xorg-video-imstt- xserver-xorg-video-i740- xserver-xorg-video-i128- xserver-xorg-video-glint- xserver-xorg-video-dummy- xserver-xorg-video-cyrix- xserver-xorg-video-chips- xserver-xorg-video-ati- xserver-xorg-video-radeon- xserver-xorg-video-mach64- xserver-xorg-video-r128- xserver-xorg-video-cirrus- xserver-xorg-video-ark- xserver-xorg-video-apm-"
  
  # well-suited software for the FreeRunner
  PACKAGES_TASK_GAMES="mokomaze sgt-puzzles"
@@@ -336,8 -335,6 +336,8 @@@ OPTION
                       sets the HOSTNAME variable
  	--mount-proc
                       mounts /proc directory in Debian chroot
 +	-np|--no-partitioning
 +                     disable the partitioning when otherwise doing "all"
  	--part1-fs <vfat|ext2|ext3>
                       sets the SD_PART1_FS variable
  	--part1-size <megabytes>
@@@ -1391,9 -1388,6 +1391,9 @@@ d
                          assignParametername="$i"
                          assignVariablename="HOSTNAME"
  			;;
 +		 "--no-partitioning")
 +			intern_no_partitioning="true"
 +			;;
  		 "--part1-fs")
                          assignParametername="$i"
  			assignVariablename="SD_PART1_FS"
@@@ -1421,11 -1415,7 +1421,11 @@@
  		 "all")
  			action_testing
  			action_time
 -			action_partition
 +			if [ -n "$intern_no_partitioning" ]; then
 +				echo " * Skipping partitioning since --no-partitioning flag set"
 +			else
 +				action_partition
 +			fi
  			action_format
  			action_mount
  			action_debian

-- 
Various non-packaged files