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

Timo Juhani Lindfors timo.lindfors at iki.fi
Mon Jan 9 08:53:10 UTC 2012


The following commit has been merged in the master branch:
commit 35d2524c30ded29b75d033bc15848183b0f4f0f7
Merge: a801ac157062c4f8a42a032e24a8addd6fa122dc 174462dd59c100b434fd3b706d5f0346176832a0
Author: Timo Juhani Lindfors <timo.lindfors at iki.fi>
Date:   Mon Jan 9 10:52:59 2012 +0200

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

diff --combined install.sh
index a43532b,c5c76e1..b4ca468
--- a/install.sh
+++ b/install.sh
@@@ -65,7 -65,7 +65,7 @@@ TRAYER=${TRAYER:-trayer
  ZHONE=${ZHONE:-true}
  
  # let us all see the same error messages and possibly suppress some by apt-get
- export LANG=C
+ export LANG=C.UTF-8
  
  # hardening for the case that a user uses capitals
  lc APT_RECOMMENDS BOOTSTRAPPER FSO_DEVICE QI QI_VERBOSE_BOOT SD_PART1_FS SD_PART2_FS 
@@@ -99,7 -99,7 +99,7 @@@ intern_no_partitioning="
  CDEBOOTSTRAP_FLAVOUR=minimal
  DEBOOTSTRAP_VARIANT=minbase
  CDEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/c/cdebootstrap/cdebootstrap-static_0.5.8+b1_armel.deb
- DEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/d/debootstrap/debootstrap_1.0.36_all.deb
+ DEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/d/debootstrap/debootstrap_1.0.37_all.deb
  CDEBOOTSTRAP_EXTRA_PACKAGES=
  DEBOOTSTRAP_EXTRA_PACKAGES=install-info
  # This gets passed to boot strappers. currently not used
@@@ -1386,6 -1386,8 +1386,6 @@@ __END_
  	cat >> "$INST_DIR/etc/fstab" <<__END__
  proc	/proc		proc	defaults				0 0
  tmpfs	/tmp		tmpfs	defaults,noatime			0 0
 -tmpfs	/var/lock	tmpfs	defaults,noatime			0 0
 -tmpfs	/var/run	tmpfs	defaults,noatime			0 0
  __END__
  
  	echo " * Setting /etc/hostname to $HOSTNAME"

-- 
Various non-packaged files



More information about the pkg-fso-commits mailing list