From 5d115ef935b6ecc2df4d5ac9aa86cc055990ad69 Mon Sep 17 00:00:00 2001
From: ficus <ficus@robocracy.org>
Date: Sun, 23 Sep 2012 20:03:04 +0200
Subject: add missing files

---
 freedom-maker/bin/install.sh      | 18 +++++++++---------
 freedom-maker/bin/packages-chroot |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'freedom-maker/bin')

diff --git a/freedom-maker/bin/install.sh b/freedom-maker/bin/install.sh
index 615f6a4..2c3385d 100755
--- a/freedom-maker/bin/install.sh
+++ b/freedom-maker/bin/install.sh
@@ -14,7 +14,7 @@ export FK_MACHINE="Globalscale Technologies Dreamplug"
 # configure all packages unpacked earlier by multistrap
 dpkg --configure -a
 
-echo "Adding source packages to filesystem"
+echo "[NOT] Adding source packages to filesystem"
 dpkg --get-selections > /tmp/selections
 mkdir -p /sourcecode
 cd sourcecode
@@ -50,24 +50,24 @@ echo "Running torouter_preboot.sh..."
 echo "Mangling kernel..."
 mkdir /tmp/initrd-repack
 (cd /tmp/initrd-repack ; \
-    zcat /boot/initrd.img-3.2.0-3-kirkwood | cpio -i ; \
+    zcat /boot/initrd.img-$kernelversion | cpio -i ; \
     rm -f conf/param.conf ; \
     find . | cpio --quiet -o -H newc | \
-	gzip -9 > /boot/initrd.img-3.2.0-3-kirkwood )
+	gzip -9 > /boot/initrd.img-$kernelversion)
 rm -rf /tmp/initrd-repack
 
 (cd /boot ; \
-    cp /usr/lib/linux-image-3.2.0-3-kirkwood/kirkwood-dreamplug.dtb dtb ; \
-    cat vmlinuz-3.2.0-3-kirkwood dtb >> temp-kernel ; \
-    mkimage -A arm -O linux -T kernel -n 'Debian kernel 3.2.0-3-kirkwood' \
+    cp /usr/lib/linux-image-$kernelversion/kirkwood-dreamplug.dtb dtb ; \
+    cat vmlinuz-$kernelversion dtb >> temp-kernel ; \
+    mkimage -A arm -O linux -T kernel -n 'Debian kernel $kernelversion' \
 	-C none -a 0x8000 -e 0x8000 -d temp-kernel uImage ; \
     rm -f temp-kernel ; \
     mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 \
-	-n 'Debian ramdisk 3.2.0-3-kirkwood' \
-	-d initrd.img-3.2.0-3-kirkwood uInitrd )
+	-n 'Debian ramdisk $kernelversion' \
+	-d initrd.img-$kernelversion uInitrd )
 
 # Establish an initial root password
-echo "Set root password to "$rootpassword
+echo "Set root password to $rootpassword"
 echo root:$rootpassword | /usr/sbin/chpasswd
 
 # Create a default user
diff --git a/freedom-maker/bin/packages-chroot b/freedom-maker/bin/packages-chroot
index f2f0e4c..29a7ae4 100755
--- a/freedom-maker/bin/packages-chroot
+++ b/freedom-maker/bin/packages-chroot
@@ -1,8 +1,8 @@
-#! /bin/sh
+#!/bin/sh
 
 # try to install locally-sourced torouter .deb files
 dpkg -i /tmp/dpkg/*.deb
 
 # try to install libertas_uap hack
-cd /tmp/uap_hack/dreamplug_libertas_$(uname -r) && ./install.sh
+cd /tmp/uap_hack/dreamplug_libertas_$kernelversion && ./install.sh
 
-- 
cgit v1.2.3