sd card refactor

3 files changed, 22 insertions, 22 deletions

diff --git a/packages/torouter-prep/configs/etc/fstab b/packages/torouter-prep/configs/etc/fstab
index 7c48827..c4318d3 100644
--- a/packages/torouter-prep/configs/etc/fstab
+++ b/packages/torouter-prep/configs/etc/fstab
@@ -1,6 +1,6 @@
-/dev/sdc2 /		auto	relatime,rw	0	0
+/dev/sdb2 /		auto	relatime,rw	0	0
 proc	  /proc		proc	none		0	0
 sys	  /sys		sysfs	none		0	0
 none	  /dev/pts	devpts	defaults	0	0
 tmpfs     /tmp          tmpfs   rw,nosuid,nodev 0       0
-/dev/sdc1 /boot  	vfat	defaults	0	0
+/dev/sdb1 /boot  	vfat	defaults	0	0
diff --git a/packages/torouter-prep/configs/sbin/copy2dream b/packages/torouter-prep/configs/sbin/copy2dream
index 267c2b6..d171bdf 100644
--- a/packages/torouter-prep/configs/sbin/copy2dream
+++ b/packages/torouter-prep/configs/sbin/copy2dream
@@ -35,7 +35,7 @@ mknod /media/dev/null c 1 3
 mknod /media/dev/ptmx c 5 2
 
 # patch up /etc/fstab entry for /boot
-sed -e 's/sdc/sda/g' < /etc/fstab > /media/etc/fstab
+sed -e 's/sdb/sda/g' < /etc/fstab > /media/etc/fstab
 
 # flash the kernel and create the device's keys
 chroot /media /etc/init.d/first-run
diff --git a/packages/torouter-prep/src/torouter_preboot.sh b/packages/torouter-prep/src/torouter_preboot.sh
index 70c08aa..267a462 100755
--- a/packages/torouter-prep/src/torouter_preboot.sh
+++ b/packages/torouter-prep/src/torouter_preboot.sh
@@ -16,49 +16,49 @@ export TORADMINGROUP="debian-tor"
 # if [ `apt-get --simulate install apt-utils tor torouterui ttdnsd` ]
 
 # Set us to have a default host name and hosts file
-install -o root -g root -m 600 $config_dir/etc/hostname /etc/hostname
-install -o root -g root -m 600 $config_dir/etc/hosts /etc/hosts
+install -o root -g root -m 644 $config_dir/etc/hostname /etc/hostname
+install -o root -g root -m 644 $config_dir/etc/hosts /etc/hosts
 
 # We need to prep apt to understand that we want packages from other repos
-install -o root -g root -m 600 $config_dir/etc/apt/sources.list /etc/apt/sources.list
+install -o root -g root -m 644 $config_dir/etc/apt/sources.list /etc/apt/sources.list
 
 # Reconfigure /etc/inittab here
-install -o root -g root -m 600 $config_dir/etc/inittab /etc/inittab
+install -o root -g root -m 644 $config_dir/etc/inittab /etc/inittab
 
 # Reconfigure fstab
-install -o root -g root -m 600 $config_dir/etc/fstab /etc/fstab
+install -o root -g root -m 644 $config_dir/etc/fstab /etc/fstab
 
 # Configure the network
 # eth0 is our "internet" interface with a dhcp client
-install -o root -g root -m 600 $config_dir/etc/network/interfaces /etc/network/interfaces
+install -o root -g root -m 644 $config_dir/etc/network/interfaces /etc/network/interfaces
 
 # Configure dnsmasq
-install -o root -g root -m 600 $config_dir/etc/dnsmasq.conf /etc/dnsmasq.conf
-install -o root -g root -m 600 $config_dir/etc/dnsmasq_lan.conf /etc/dnsmasq_lan.conf
-install -o root -g root -m 600 $config_dir/etc/dnsmasq_wifi.conf /etc/dnsmasq_wifi.conf
+install -o root -g root -m 644 $config_dir/etc/dnsmasq.conf /etc/dnsmasq.conf
+install -o root -g root -m 644 $config_dir/etc/dnsmasq_lan.conf /etc/dnsmasq_lan.conf
+install -o root -g root -m 644 $config_dir/etc/dnsmasq_wifi.conf /etc/dnsmasq_wifi.conf
 
 # new dns scheme
-install -o root -g root -m 600 $config_dir/etc/default/dnsmasq /etc/default/dnsmasq
-install -o root -g root -m 750 $config_dir/etc/init.d/dnsmasq_lan /etc/init.d/dnsmasq_lan
-install -o root -g root -m 750 $config_dir/etc/init.d/dnsmasq_wifi /etc/init.d/dnsmasq_wifi
+install -o root -g root -m 644 $config_dir/etc/default/dnsmasq /etc/default/dnsmasq
+install -o root -g root -m 754 $config_dir/etc/init.d/dnsmasq_lan /etc/init.d/dnsmasq_lan
+install -o root -g root -m 754 $config_dir/etc/init.d/dnsmasq_wifi /etc/init.d/dnsmasq_wifi
 
 # Configure ntp
-install -o root -g root -m 600 $config_dir/etc/ntp.conf /etc/ntp.conf
-install -o root -g root -m 600 $config_dir/etc/default/openntpd /etc/default/openntpd
+install -o root -g root -m 644 $config_dir/etc/ntp.conf /etc/ntp.conf
+install -o root -g root -m 644 $config_dir/etc/default/openntpd /etc/default/openntpd
 
 # Configure ssh
-install -o root -g root -m 600 $config_dir/etc/ssh/sshd_config /etc/ssh/sshd_config
+install -o root -g root -m 644 $config_dir/etc/ssh/sshd_config /etc/ssh/sshd_config
 
 # XXX We should configure ufw here
 # XXX We should configure denyhosts
 
 # torrc permissions get overwritten below
-install -o root -g root -m 600 $config_dir/etc/tor/torrc /etc/tor/torrc
+install -o root -g root -m 644 $config_dir/etc/tor/torrc /etc/tor/torrc
 
-install -o root -g root -m 600 $config_dir/etc/default/ttdnsd /etc/default/ttdnsd
+install -o root -g root -m 644 $config_dir/etc/default/ttdnsd /etc/default/ttdnsd
 
 # install tor firewall helper
-install -o root -g root -m 750 $config_dir/sbin/tor-wireless-firewall.sh /usr/sbin/
+install -o root -g root -m 754 $config_dir/sbin/tor-wireless-firewall.sh /usr/sbin/
 
 # Remove a bunch of stuff
 apt-get -f -y remove --purge polipo minissdpd
@@ -70,7 +70,7 @@ apt-get install -f
 apt-get -y clean
 
 ## Disable ipv6 support for now
-install -o root -g root -m 600 $config_dir/etc/modprobe.d/blacklist.conf /etc/modprobe.d/blacklist.conf
+install -o root -g root -m 644 $config_dir/etc/modprobe.d/blacklist.conf /etc/modprobe.d/blacklist.conf
 
 ## add users and groups (ignore failures if groups already exist)
 addgroup $ADMINGROUP