From 3698a57fdaed1a4e3ce074113bbe876c9609a0d4 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <abaumann@yahoo.com>
Date: Sun, 18 May 2014 17:33:09 +0200
Subject: reactivated

---
 archauto.sh | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'archauto.sh')

diff --git a/archauto.sh b/archauto.sh
index 0463eac..cdf2e16 100755
--- a/archauto.sh
+++ b/archauto.sh
@@ -36,7 +36,7 @@ mkfs.ext4 ${INSTALL_DRIVE}${PARTITION_ROOT}
 mkdir -p ${MOUNT_PATH}
 mount ${INSTALL_DRIVE}${PARTITION_ROOT} ${MOUNT_PATH}
 
-export http_proxy=http://192.168.1.12:3128
+#export http_proxy=http://192.168.1.12:3128
 export no_proxy=localhost,10.0.2.2
 
 # use our local cache
@@ -55,7 +55,7 @@ sed -i '/\[extra\]/aServer = http://10.0.2.2:8080/$repo/os/$arch' ${MOUNT_PATH}/
 sed -i '/\[community\]/aServer = http://10.0.2.2:8080/$repo/os/$arch' ${MOUNT_PATH}/etc/pacman.conf
 
 # add our local packages into a separate repository
-printf "\n[aba]\nServer = http://10.0.2.2:8080/\044repo/os/\044arch\n" >> ${MOUNT_PATH}/etc/pacman.conf
+#printf "\n[aba]\nServer = http://10.0.2.2:8080/\044repo/os/\044arch\n" >> ${MOUNT_PATH}/etc/pacman.conf
 
 # synchronize package databases for installed pacman
 arch-chroot ${MOUNT_PATH} pacman -Sy
@@ -88,7 +88,7 @@ echo "archiso" > ${MOUNT_PATH}/etc/hostname
 
 arch-chroot ${MOUNT_PATH} systemctl enable dhcpcd@ens3.service
 
-arch-chroot ${MOUNT_PATH} sh -c "echo 'root:xx' | chpasswd"
+arch-chroot ${MOUNT_PATH} sh -c "echo 'root:123qwe' | chpasswd"
 
 # synchronized time is a requirement, install and configure ntp
 # we use a standard NTP server, later we can change that via cfengine
@@ -97,23 +97,27 @@ arch-chroot ${MOUNT_PATH} ntpdate 0.pool.ntp.org
 arch-chroot ${MOUNT_PATH} systemctl enable ntpd.service
 
 # monitord needs netstat
-arch-chroot ${MOUNT_PATH} pacman --noconfirm -S net-tools
+#arch-chroot ${MOUNT_PATH} pacman --noconfirm -S net-tools
 
 # we use 'git' to manage our promises
-arch-chroot ${MOUNT_PATH} pacman --noconfirm -S git-core
+#arch-chroot ${MOUNT_PATH} pacman --noconfirm -S git-core
 
-arch-chroot ${MOUNT_PATH} pacman --noconfirm -S cfengine
+#arch-chroot ${MOUNT_PATH} pacman --noconfirm -S cfengine
 
 # install rules for the machine from git
-arch-chroot ${MOUNT_PATH} git clone ${GIT_REPO} /srv/cfengine/masterfiles
+#arch-chroot ${MOUNT_PATH} git clone ${GIT_REPO} /srv/cfengine/masterfiles
 
 # create machine keys
-arch-chroot ${MOUNT_PATH} cf-key
+#arch-chroot ${MOUNT_PATH} cf-key
 
 # enable cfengine
-arch-chroot ${MOUNT_PATH} systemctl enable cf-execd.service
-arch-chroot ${MOUNT_PATH} systemctl enable cf-monitord.service
-arch-chroot ${MOUNT_PATH} systemctl enable cf-serverd.service
+#arch-chroot ${MOUNT_PATH} systemctl enable cf-execd.service
+#arch-chroot ${MOUNT_PATH} systemctl enable cf-monitord.service
+#arch-chroot ${MOUNT_PATH} systemctl enable cf-serverd.service
+
+# for debugging
+echo "Installation.. press any key to reboot."
+read
 
 echo "Done."
 
-- 
cgit v1.2.3-54-g00ecf