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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit e77a82fb2faa4201f57dcaf80a19f3facff18497
Merge: d01a461083d18e8fd08fae1ec658b2086a9b6cb5 4278e6d12fffb475a05f216f34915db2c45c1c96
Author: Steffen Moeller <moeller at debian.org>
Date:   Wed Mar 11 00:07:04 2009 +0100

    Merged branch 'localepurge'. Works.
    
    Conflicts:
    	install.sh

diff --combined install.sh
index ea3694b,334cfec..3068d26
--- a/install.sh
+++ b/install.sh
@@@ -49,6 -49,7 +49,7 @@@ FSO_DEVICE=${FSO_DEVICE:-gta02
  HOSTNAME=${HOSTNAME:-debian-gta02}
  INST_DIR=${INST_DIR:-/mnt/debian}
  INST_MIRROR=${INST_MIRROR:-http://ftp2.de.debian.org/debian}
+ LOCALEPURGE=${LOCALEPURGE:-}
  QI=${QI:-false}
  QI_VERBOSE_BOOT=${QI_VERBOSE_BOOT:-false}
  SD_DEVICE=${SD_DEVICE:-/dev/mmcblk0}
@@@ -74,6 -75,7 +75,6 @@@ VERSION=1.
  VERBOSE=${VERBOSE:-}
  TESTHOST=${TESTHOST:-www.debian.org}
  RDATEHOST=${RDATEHOST:-ntp.fu-berlin.de}
 -WPA_SUPPLICANT_CONF=${WPA_SUPPLICANT_CONF:-/etc/wpa_supplicant/wpa_supplicant.conf}
  DROPBEAR_KEYS="/etc/dropbear/dropbear_rsa_host_key /etc/dropbear/dropbear_dss_host_key"
  
  # internal variables
@@@ -98,7 -100,7 +99,7 @@@ PACKAGES_TASK_GAMES="mokomaze sgt-puzzl
  PACKAGES_TASK_GPS="tangogps"
  PACKAGES_TASK_PHONE="zhone"
  PACKAGES_TASK_WEB="midori"
 -PACKAGES_TASK_WIFI="wpasupplicant wireless-tools udhcpc"
 +PACKAGES_TASK_WIFI="dhcp3-client wpasupplicant wireless-tools"
  
  # device-specific values
  UBOOT_ENV_SIZE=262144
@@@ -210,6 -212,10 +211,10 @@@ ENVIRONMEN
                       should be set to a mirror nearby that carries armel
                       binaries for unstable and experimental (set to
                       '$INST_MIRROR')
+ 	LOCALEPURGE  Set to 'true' iff the package of the same name shall
+                      be installed. It reduces disk space enormously,
+                      but needs user interaction for the install (set to
+                      '$LOCALEPURGE').
  	APT_RECOMMENDS   control if APT should install recommends by default
                       (set to '$APT_RECOMMENDS', possible values are false/true)
  	DASH_BINSH   configure dash as default /bin/sh (set to '$DASH_BINSH',
@@@ -229,6 -235,9 +234,6 @@@
  	TESTHOST     name of machine that should be tested for availability
                       (set to '$TESTHOST')
  	VERBOSE      increase amount of information that is forwarded to stdout
 -	WPA_SUPPLICANT_CONF
 -                     local configuration which to transfer to neo
 -                     (set to '$WPA_SUPPLICANT_CONF')
  
      Stages:
  
@@@ -261,9 -270,11 +266,10 @@@
                                moment)
                         PHONE  zhone (always selected)
                         WEB    midori
 -                       WIFI   wicd, wireless-tools, wpasupplicant
 -                              and the transfer of a local wpa configuration
 +                       WIFI   wicd, wireless-tools, wpasupplicant, dhcp3-client
                       To specify the tasks shall be assigned to the TASKS
-                      environment variable as a comma separated list.
+                      environment variable as a comma separated list (set to
+                      '$TASKS').
  	configuration    Configures various parts of the system, such as
                       the X server
  	kernel       Downloads and installs the Debian kernel package
@@@ -293,6 -304,8 +299,8 @@@ OPTION
                       sets the SD_SWAP_SIZE variable
  	--with-tasks <tasks>
                       sets the TASKS variable
+ 	--with-localepurge
+                      will install the localepurge package
  
  EXAMPLE
  
@@@ -652,7 -665,7 +660,7 @@@ action_format () 
  #
  action_mount () {
  	echo "Mounting the newly created system"
 -	if [ -d "$INST_DIR" ]; then
 +	if [ ! -d "$INST_DIR" ]; then
  		mkdir -p "$INST_DIR"; 
  		intern_instdir_already_present="" 
  	elif [ -n "$VERBOSE" ]; then
@@@ -800,6 -813,12 +808,6 @@@ action_tasks () 
  
  		case "$intern_task" in
  		  "WIFI")
 -			#sed -i '/^exec/iif [ -x /usr/bin/wicd-client ]; then wicd-client --no-animate &; fi' "$INST_DIR/root/.xsession"
 -
 -			if [ -r "$WPA_SUPPLICANT_CONF" ]; then
 -				echo " * copying '$WPA_SUPPLICANT_CONF' from this machine"
 -				cp "$WPA_SUPPLICANT_CONF" "$INST_DIR$WPA_SUPPLICANT_CONF"
 -			fi
  
  			echo " * modifying .xsession to autostart wicd-client"
  			sed -i '/^exec/i#wicd-client --no-animate &' "$INST_DIR/root/.xsession"
@@@ -827,9 -846,13 +835,15 @@@
  #
  # Stage configuration
  #
++
  action_configuration () {
  	echo "Configuring system files for ${FSO_DEVICE}"
  
+ 	if [ "true" = "$LOCALEPURGE" ]; then
++		echo " * installing localepurge"
+ 		chroot "$INST_DIR" apt-get $APT_OPTIONS install localepurge
 -	if
++	fi
+ 
  	echo " * Installing the fso-config-${FSO_DEVICE} package"
  	chroot "$INST_DIR" apt-get $APT_OPTIONS install fso-config-${FSO_DEVICE}
  
@@@ -1248,6 -1271,9 +1262,9 @@@ d
  			assignNumeric="true"
  			assignVariablename="SD_SWAP_SIZE"
  			;;
+ 		 "--with-localepurge")
+ 			LOCALEPURGE="true"
+ 			;;
  		 "--with-tasks")
                          assignParametername="$i"
  			assignVariablename="TASKS"
@@@ -1267,6 -1293,11 +1284,6 @@@
  				action_tasks
  			fi
  			action_kernel
 -			if [ "vfat" == "SD_PART1_FS" ]; then
 -				echo "Skipping uboot modification since boot partition is of type '$SD_PART1_FS'."
 -			else
 -				action_uboot
 -			fi
  			action_unmount
  			;;
  		 "testing"|"time"|"partition"|"format"|"mount"|"debian"|"apt"|"fso"|"configuration"|"kernel"|"unmount"|"uboot"|"tasks")

-- 
Various non-packaged files