[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 8d12291ab8757d78c3931837d7b2eb146234dbfa
Steffen Moeller
moeller at debian.org
Sun Feb 22 22:43:35 UTC 2009
The following commit has been merged in the master branch:
commit 8d12291ab8757d78c3931837d7b2eb146234dbfa
Author: Steffen Moeller <moeller at debian.org>
Date: Sun Feb 22 23:42:27 2009 +0100
Substituting "--yes --purge" variable.
Following suggestion of Joachim to instroduce an APT_OPTIONS variable.
diff --git a/install.sh b/install.sh
old mode 100644
new mode 100755
index b395925..5964d00
--- a/install.sh
+++ b/install.sh
@@ -183,32 +183,34 @@ ENVIRONMENT
To influence the program's behaviour, set the following
environment variables or leave the default values.
- HOSTNAME the name of the machine (default to debian-gta02)
+ APT_OPTIONS extra parameters sent to apt for installing packages
+ (set to '$APT_OPTIONS').
+ HOSTNAME the name of the machine (set to '$HOSTNAME')
SD_DEVICE the character device to access the microSD card
- (default to /dev/mmcblk0)
+ (set to '$SD_DEVICE')
SD_PART1_FS the filesystem for the first microSD card partition,
- i.e. the one containing the uImage.bin (default to
- ext2, possible values are ext2/vfat)
- SD_PART1_SIZE number of megabytes for first partition (default $SD_PART1_SIZE)
- SD_SWAP_SIZE number of megabytes of swap partition (default $SD_SWAP_SIZE)
+ i.e. the one containing the uImage.bin (set to
+ '$SD_PART1_FS', possible values are ext2/vfat)
+ SD_PART1_SIZE number of megabytes for first partition (set to '$SD_PART1_SIZE')
+ SD_SWAP_SIZE number of megabytes of swap partition (set to '$SD_SWAP_SIZE')
INST_DIR the directory where the microSD card partitions
- will be mounted to (default to /mnt/debian)
+ will be mounted to (set to '$INST_DIR')
INST_MIRROR the Debian mirror used during installation, it
should be set to a mirror nearby that carries armel
- binaries for unstable and experimental (default to
- http://ftp2.de.debian.org/debian)
+ binaries for unstable and experimental (set to
+ '$INST_MIRROR')
APT_RECOMMENDS control if APT should install recommends by default
- (default to false, possible values are false/true)
- DASH_BINSH configure dash as default /bin/sh (default to true,
+ (set to '$APT_RECOMMENDS', possible values are false/true)
+ DASH_BINSH configure dash as default /bin/sh (set to '$DASH_BINSH',
possible values are true/false)
- FSO_MIRROR the Debian FSO repository (default to
- http://pkg-fso.alioth.debian.org/debian)
+ FSO_MIRROR the Debian FSO repository (set to
+ '$FSO_MIRROR')
FSO_DEVICE the device the installation is being performed on
(default to gta02, possible value is gta02 only)
QI if you use Qi bootloader set this to true
- (default to false)
+ (set to '$QI')
QI_VERBOSE_BOOT set this to true if you want to see the kernel messages
- do this only when QI=true (default to false)
+ do this only when QI=true (set to '$QI_VERBOSE_BOOT')
SINGLE_PART set this to true if only one partition should be created
this is true by default for QI=true and false if SD_PART1_FS=vfat
WITH_WIFI determines how to configure the wireless connections. Set
@@ -253,12 +255,17 @@ OPTIONS
options have been implemented to be set as arguments:
-h|--help shows this information
+ --apt-options <options>
+ sets the APT_OPTIONS variable
--hostname <name>
sets the HOSTNAME variable
- --part1-fs sets the SD_PART1_FS variable
- --part1-size sets the SD_PART1_SIZE variable
- --swap-size sets the SD_SWAP_SIZE variable
- --with-wifi sets the WITH_WIFI variable (experimental, not functional)
+ --part1-fs <vfat|ext2|ext3>
+ sets the SD_PART1_FS variable
+ --part1-size <megabytes>
+ sets the SD_PART1_SIZE variable
+ --swap-size <megabytes>
+ sets the SD_SWAP_SIZE variable
+ --with-wifi sets the WITH_WIFI variable (experimental, non functional)
BUGS
Only the current (second) generation of devices is supported.
@@ -667,7 +674,7 @@ __END__
chroot $INST_DIR apt-get update
echo " * Installing pkg-fso keyring"
- chroot $INST_DIR apt-get --yes --force-yes install pkg-fso-keyring
+ chroot $INST_DIR apt-get $APT_OPTIONS install pkg-fso-keyring
echo " * Removing additional packages"
chroot $INST_DIR /bin/sh -e <<__END_CHROOT__
@@ -687,7 +694,7 @@ action_fso () {
# TODO
echo "Installing FSO-specific packages"
chroot $INST_DIR /bin/sh -e <<__END_CHROOT__
-apt-get --yes --force-yes install $FSO_PACKAGES
+apt-get $APT_OPTIONS install $FSO_PACKAGES
apt-get clean
__END_CHROOT__
echo "I: FSO packages installed"
@@ -701,7 +708,7 @@ action_configuration () {
echo "Configuring system files for ${FSO_DEVICE}"
echo " * Installing the fso-config-${FSO_DEVICE} package"
- chroot $INST_DIR apt-get --yes --force-yes install fso-config-${FSO_DEVICE}
+ chroot $INST_DIR apt-get $APT_OPTIONS install fso-config-${FSO_DEVICE}
echo " * Creating /etc/X11/xorg.conf"
cat > $INST_DIR/etc/X11/xorg.conf <<__END__
@@ -828,7 +835,7 @@ __END__
echo " * Installing dash as /bin/sh: $DASH_BINSH"
echo 'dash dash/sh string $DASH_BINSH' | chroot $INST_DIR debconf-set-selections
- chroot $INST_DIR apt-get --yes --force-yes install dash
+ chroot $INST_DIR apt-get $APT_OPTIONS install dash
case "$WITH_WIFI" in
"wicd")
@@ -852,7 +859,7 @@ __END__
if [ -f "$WPA_SUPPLICANT_CONF" ]; then
echo " * Installing wpasupplicant, wireless-tools and udhcpc"
- chroot $INST_DIR apt-get --yes --force-yes install wpasupplicant wireless-tools udhcpc
+ chroot $INST_DIR apt-get $APT_OPTIONS install wpasupplicant wireless-tools udhcpc
echo " * $WPA_SUPPLICANT_CONF copied from this machine"
cat >$INST_DIR$WPA_SUPPLICANT_CONF <$WPA_SUPPLICANT_CONF
fi
@@ -884,7 +891,7 @@ EOMATCHBOX
action_kernel () {
echo "Installing kernel package"
- intern_cmd="apt-get --yes --force-yes install linux-image-2.6.28-openmoko-gta02"
+ intern_cmd="apt-get $APT_OPTIONS install linux-image-2.6.28-openmoko-gta02"
if [ "$SD_PART1_FS" = "vfat" ]; then
intern_bootmountpoint=$(mount | grep "^${SD_DEVICE}p1"| cut -f3 -d\ )
@@ -1103,6 +1110,10 @@ do
echo "$VERSION"
exit 0
;;
+ "--apt-options")
+ assignParametername="$i"
+ assignVariablename="APT_OPTIONS"
+ ;;
"--hostname")
assignParametername="$i"
assignVariablename="HOSTNAME"
--
Various non-packaged files
More information about the pkg-fso-commits
mailing list