Skip to content
Browse files

Merge pull request #7 from agravier/master

Some small fixes
  • Loading branch information...
2 parents 9a12329 + 38386bc commit 88129f79fe499dc71d5a88fdef29df2ea12704bc @guillaumebrunerie committed Mar 6, 2012
Showing with 5 additions and 2 deletions.
  1. +2 −0 chromiarchos-multi
  2. +3 −2 chromiarchos-restore
View
2 chromiarchos-multi
@@ -18,4 +18,6 @@ for daemon in "${DAEMONS[@]}"; do
esac
done
+[[ $TIMEZONE ]] && status "Configuring timezone" set_timezone "$TIMEZONE"
+
[[ -x /etc/rc.local ]] && /etc/rc.local
View
5 chromiarchos-restore
@@ -4,6 +4,7 @@
# Copyright © 2011, Guillaume Brunerie <guillaume.brunerie@[ens.fr|gmail.com]>
HOSTNAME=Archbook
+UPSTART_FILE=chromiarchos.conf
mustberoot()
{
@@ -45,11 +46,11 @@ then
echo "Phase 1 of 2 completed, please reboot and run $0 again to complete the restoring."
else
- if [[ ! -e /etc/init/tty3.conf ]]
+ if [[ ! -e /etc/init/$UPSTART_FILE ]]
then
echo "Phase 2 of 2"
echo "* Installing new upstart job for Arch"
- cp /usr/local/share/tty3.conf /etc/init
+ cp /usr/local/share/$UPSTART_FILE /etc/init
echo "* Modifying hostname"
if [[ $(grep -c "^hostname localhost$" /sbin/chromeos_startup) == 1 \
&& $(grep -c "^127.0.0.1 localhost$" /etc/hosts) == 1 \

0 comments on commit 88129f7

Please sign in to comment.
Something went wrong with that request. Please try again.