debugging user creation problem

10 files changed, 3 insertions, 113 deletions

diff --git a/config/hooks/kernel-image.sh.chroot b/config/hooks/kernel-image.sh.chroot
index 2c15971..31dbaf1 100755
--- a/config/hooks/kernel-image.sh.chroot
+++ b/config/hooks/kernel-image.sh.chroot
@@ -3,9 +3,10 @@
 set -e
 
 # TODO: this seems to be a null-op... flash-kernel is symlinked to `true`?
-echo "Trying to flashing kernel..."
+# XXX: remove this
+#echo "Trying to flashing kernel..."
 #/usr/sbin/flash-kernel || echo "Failed to flash kernel! Don't worry, will mangle"
-/usr/sbin/flash-kernel
+#/usr/sbin/flash-kernel
 
 echo "Mangling kernel..."
 mkdir /tmp/initrd-repack
diff --git a/config/hooks/remove-packages.sh.chroot b/config/hooks/remove-packages.sh.chroot
deleted file mode 100755
index 0f46ef6..0000000
--- a/config/hooks/remove-packages.sh.chroot
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Removing unwanted apt packages"
-apt-get -f -y remove --purge polipo minissdpd
-apt-get -y remove exim4-base exim4-config exim4-daemon-light dbus isc-dhcp-server
-
diff --git a/config/hooks/tor-usergroup.sh.chroot b/config/hooks/tor-usergroup.sh.chroot
deleted file mode 100755
index 67ca241..0000000
--- a/config/hooks/tor-usergroup.sh.chroot
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-echo "Creating tor user and groups"
-
-export ADMINUSER="tor"
-export ADMINGROUP="tor"
-export TORADMINGROUP="debian-tor"
-
-# add users and groups (ignore failures if groups already exist)
-addgroup $ADMINGROUP
-useradd -g $ADMINGROUP -G $TORADMINGROUP -s /bin/bash $ADMINUSER
-# TODO: $ADMINUSER passwd?
-
-# give Tor permission to modify it's own configuration
-chgrp $TORADMINGROUP /etc/tor/ /etc/tor/*
-chmod g+rw /etc/tor/ /etc/tor/*
-
diff --git a/config/includes.chroot/etc/modprobe.d/blacklist.conf b/config/includes.chroot/etc/modprobe.d/blacklist.conf
deleted file mode 100644
index dfb7967..0000000
--- a/config/includes.chroot/etc/modprobe.d/blacklist.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file lists modules which will not be loaded as the result of
-# alias expansion, with the purpose of preventing the hotplug subsystem
-# to load them. It does not affect autoloading of modules by the kernel.
-# This file is provided by the udev package.
-
-# evbug is a debug tool and should be loaded explicitly
-blacklist evbug
-
-# these drivers are very simple, the HID drivers are usually preferred
-blacklist usbmouse
-blacklist usbkbd
-
-# replaced by e100
-blacklist eepro100
-
-# replaced by tulip
-blacklist de4x5
-
-# replaced by tmscsim
-blacklist am53c974
-
-# these watchdog drivers break some systems
-blacklist iTCO_wdt
-
-# We do not need or want ipv6 right now
-blacklist ipv6
diff --git a/config/includes.chroot/etc/network/interfaces b/config/includes.chroot/etc/network/interfaces
deleted file mode 100644
index 34b2f35..0000000
--- a/config/includes.chroot/etc/network/interfaces
+++ /dev/null
@@ -1,44 +0,0 @@
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-# The primary network interface
-auto eth0
-iface eth0 inet dhcp
-	post-down ifdown uap0
-
-auto eth1
-iface eth1 inet static
-	address 10.23.42.1
-	netmask 255.255.255.0
-	network 10.23.42.0
-	broadcast 10.23.42.255
-    pre-up ip addr del 10.23.42.1/24 dev eth1 || true
-	post-up echo 1 > /proc/sys/net/ipv4/ip_forward
-	post-up /etc/init.d/dnsmasq_lan start
-	# this must happen after have brought up uap0 because it clears the nat tables
-	post-up iptables -t nat -A POSTROUTING -s 10.23.42.0/24 -o eth0 -j MASQUERADE
-	pre-down /etc/init.d/dnsmasq_lan stop
-
-# The magic Tor wireless network
-auto uap0
-iface uap0 inet static
-	address 172.16.23.1
-	netmask 255.255.255.0
-	network 172.16.23.0
-	broadcast 172.16.23.255
-	pre-up ifconfig uap0 hw ether 00:66:66:66:66:66
-    pre-up ip addr del 172.16.23.1/24 dev uap0 || true
-	post-up /etc/init.d/tor start
-    post-up /etc/init.d/tor reload
-	post-up /etc/init.d/dnsmasq_wifi start
-	post-up /etc/init.d/ttdnsd restart
-	post-up /usr/bin/uaputl sys_cfg_ssid "torproject" || true
-	post-up /usr/bin/uaputl bss_start || true
-	post-up /usr/sbin/tor-wireless-firewall.sh || true
-    post-up /sbin/iptables -t nat -A OUTPUT -p tcp -d 10.192.0.0/10 -j REDIRECT --to-ports 9040 
-	pre-down /usr/bin/uaputl bss_stop || true
-	pre-down /etc/init.d/dnsmasq_wifi stop
diff --git a/config/includes.chroot/etc/resolv.conf b/config/includes.chroot/etc/resolv.conf
deleted file mode 100644
index af9304d..0000000
--- a/config/includes.chroot/etc/resolv.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-nameserver 208.67.222.222
-nameserver 208.67.220.220
diff --git a/config/includes.chroot/etc/sysctl.conf b/config/includes.chroot/etc/sysctl.conf
deleted file mode 100644
index 916e972..0000000
--- a/config/includes.chroot/etc/sysctl.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Reduce writes to flash drives
-vm.laptop_mode=5
-vm.swappiness=0
-vm.dirty_writeback_centisecs=1500
-vm.dirty_expire_centisecs=1500
diff --git a/config/package-lists/debian.list.chroot b/config/package-lists/debian.list.chroot
index 926ee03..5f857a7 100644
--- a/config/package-lists/debian.list.chroot
+++ b/config/package-lists/debian.list.chroot
@@ -6,15 +6,11 @@ wget
 iproute
 net-tools
 hostname
-module-init-tools
 wget
-resolvconf
 udev
 isc-dhcp-client
 ifupdown
 devio
-initramfs-tools
-uboot-mkimage
 parted
 dosfstools
 apt
@@ -25,7 +21,6 @@ pandoc
 python-simplejson
 make
 dialog
-locales-all
 uaputl
 uapevent
 dnsmasq
@@ -48,8 +43,5 @@ dnsutils
 torsocks
 lsof
 vim-nox
-user-setup
-live-tools
-sudo
 mtools
 parted
diff --git a/config/package-lists/dreamplug.list.chroot b/config/package-lists/dreamplug.list.chroot
index 1757229..96dda6d 100644
--- a/config/package-lists/dreamplug.list.chroot
+++ b/config/package-lists/dreamplug.list.chroot
@@ -1,4 +1 @@
-flash-kernel
-u-boot-tools
-u-boot
 wireless-tools
diff --git a/config/package-lists/torouter.list.chroot b/config/package-lists/torouter.list.chroot
deleted file mode 100644
index e69de29..0000000
--- a/config/package-lists/torouter.list.chroot
+++ /dev/null