[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. e1dfcce903b7936cac3958e7a90a9dcb7addc3b2
Steffen Moeller
moeller at debian.org
Sun Mar 22 22:48:09 UTC 2009
The following commit has been merged in the master branch:
commit e3095bb0e352c6ff893b6b8f85f3f3864710f07e
Merge: 81db5387ef3da45ed9a74373fcf52f7c17f0b6b9 724a36e8e458767b14a602974792c00d57fb9139
Author: Steffen Moeller <moeller at debian.org>
Date: Sun Mar 22 23:37:59 2009 +0100
Merge branch 'master' into ar
Conflicts:
install.sh
diff --combined install.sh
index 0b627a5,9824374..8a49374
--- a/install.sh
+++ b/install.sh
@@@ -76,6 -76,7 +76,7 @@@ VERBOSE=${VERBOSE:-
TESTHOST=${TESTHOST:-www.debian.org}
RDATEHOST=${RDATEHOST:-ntp.fu-berlin.de}
DROPBEAR_KEYS="/etc/dropbear/dropbear_rsa_host_key /etc/dropbear/dropbear_dss_host_key"
+ MOUNT_PROC=""
# internal variables
intern_instdir_already_present=""
@@@ -113,7 -114,6 +114,7 @@@ DOSFSTOOLS_PACKAGE=$INST_MIRROR/pool/ma
# FSO-MS5 busybox's tar does not support -z
TAR_PACKAGE=$INST_MIRROR/pool/main/t/tar/tar_1.20-1_armel.deb
+TAR_APPLICATION=tar
#
@@@ -124,6 -124,10 +125,10 @@@
# installed. cdebootstrap is installing it itself.
ensure_proc_is_mounted () {
+ if [ -z "$MOUNT_PROC" ]; then
+ return 0;
+ fi
+
if [ ! -d "$INST_DIR/proc" ]; then mkdir "$INST_DIR/proc"; fi
if mount | grep -q "$INST_DIR/proc"; then
@@@ -326,6 -330,8 +331,8 @@@ OPTION
sets the APT_OPTIONS variable
--hostname <name>
sets the HOSTNAME variable
+ --mount-proc
+ mounts /proc directory in Debian chroot
--part1-fs <vfat|ext2|ext3>
sets the SD_PART1_FS variable
--part1-size <megabytes>
@@@ -465,7 -471,7 +472,7 @@@ action_testing ()
fi
echo " * microSD card device: $SD_DEVICE present"
- for intern_binary in wget ping fdisk mount umount mkfs.$SD_PART1_FS mkfs.$SD_PART2_FS mkswap gunzip dd sed rdate ar pwd; do
+ for intern_binary in wget ping fdisk mount umount mkfs.$SD_PART1_FS mkfs.$SD_PART2_FS mkswap gunzip dd sed rdate ar; do
if ! which $intern_binary > /dev/null; then
echo "E: Could not find $intern_binary binary"
exit 1
@@@ -475,25 -481,16 +482,18 @@@
fi
done
- if tar --help 2>&1 | grep "Usage: tar \-\[cxtvO\]" >/dev/null; then
- echo "W: tar does not support gzip archives"
+ if $TAR_APPLICATION --help 2>&1 | grep "Usage: $TAR_APPLICATION \-\[cxtvO\]" >/dev/null; then
+ echo "W: $TAR_APPLICATION does not support gzip archives"
echo "Downloading tar package"
wget $TAR_PACKAGE -O /tmp/tar.deb
- cwd=`pwd`
- cd /tmp
- if [ -f data.tar.gz ]; then
- if [ -n "$VERBOSE" ]; then
- echo "I: removing previous /tmp/data.tar.gz"
- fi
- rm -f data.tar.gz
- fi
- ar -x tar.deb data.tar.gz
+ rm -f /tmp/data.tar.gz # FIXME: ar should just overwrite it
+ ( cd /tmp && ar -x tar.deb data.tar.gz )
mkdir -p /usr/local
- gunzip -c /tmp/data.tar.gz | tar -x -C /usr/local/
- rm -f /tmp/data.tar.gz
- rm -f /tmp/tar.deb
+ gunzip -c data.tar.gz | tar -x -C /usr/local/
+ TAR_APPLICATION=/usr/local/bin/tar
+ rm -f data.tar.gz
+ rm -f tar.deb
+ cd "$cwd"
fi
if [ "$SD_PART1_FS" = "vfat" ]; then
@@@ -503,8 -500,9 +503,9 @@@
# and then try to install the Debian dosfstools
echo "Downloading dosfstools package"
wget $DOSFSTOOLS_PACKAGE -O /tmp/dosfstools.deb
+ rm -f /tmp/data.tar.gz # FIXME: ar should just overwrite it
( cd /tmp && ar -x dosfstools.deb data.tar.gz )
- tar -xz -C / -f /tmp/data.tar.gz
+ $TAR_APPLICATION -xz -C / -f /tmp/data.tar.gz
rm -f /tmp/data.tar.gz
rm -f /tmp/dosfstools.deb
fi
@@@ -743,8 -741,9 +744,9 @@@ action_debian ()
echo " * Downloading cdebootstrap package"
wget $CDEBOOTSTRAP_PACKAGE -O /tmp/cdebootstrap.deb
+ rm -f /tmp/data.tar.gz # FIXME: ar should just overwrite it
( cd /tmp && ar -x cdebootstrap.deb data.tar.gz )
- tar -xz -C / -f /tmp/data.tar.gz
+ $TAR_APPLICATION -xz -C / -f /tmp/data.tar.gz
rm -f /tmp/data.tar.gz
rm -f /tmp/cdebootstrap.deb
@@@ -1354,7 -1353,9 +1356,9 @@@ d
assignParametername="$i"
assignVariablename="TASKS"
;;
-
+ "--mount-proc")
+ MOUNT_PROC="true"
+ ;;
"all")
action_testing
action_time
--
Various non-packaged files
More information about the pkg-fso-commits
mailing list