From e95e4c43ed8307155926fcbe6967b82492122179 Mon Sep 17 00:00:00 2001
From: Pravin Shinde <pravin@black-perl.(none)>
Date: Wed, 17 Jun 2009 18:26:45 +0200
Subject: [PATCH 1/1] Seperated the network mounting related code from linuxrc.
 It is now maintained in mount_http_iso.sh

---
 pxeknife/dsl/generate_minirt24.sh |  2 ++
 pxeknife/dsl/linuxrc              | 32 ++-----------------------
 pxeknife/dsl/mount_http_iso.sh    | 39 +++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 30 deletions(-)
 create mode 100755 pxeknife/dsl/mount_http_iso.sh

diff --git a/pxeknife/dsl/generate_minirt24.sh b/pxeknife/dsl/generate_minirt24.sh
index af56dcd..25141db 100755
--- a/pxeknife/dsl/generate_minirt24.sh
+++ b/pxeknife/dsl/generate_minirt24.sh
@@ -21,7 +21,9 @@ cp busybox mpoint/static/
 cp httpfs/server/httpfs mpoint/static/
 cp httpfs/server/fusermount mpoint/static/
 cp linuxrc mpoint/
+cp mount_http_iso.sh mpoint/
 chmod 0777 mpoint/linuxrc 
+chmod 0777 mpoint/mount_http_iso.sh 
 mknod mpoint/dev/fuse c 10 229
 
 echo "creating environment, creating links..."
diff --git a/pxeknife/dsl/linuxrc b/pxeknife/dsl/linuxrc
index 7b9e5c4..434c8a6 100755
--- a/pxeknife/dsl/linuxrc
+++ b/pxeknife/dsl/linuxrc
@@ -337,36 +337,8 @@ done
 ;;
 esac
 
-echo "HTTP Boot: inserting network modules"
-insmod /modules/crc32.o >/dev/null 2>&1  
-insmod /modules/8390.o  >/dev/null 2>&1 
-insmod /modules/mii.o  >/dev/null 2>&1 
-insmod /modules/ne2k-pci.o  >/dev/null 2>&1 
-insmod /modules/pcnet32.o  >/dev/null 2>&1 
-insmod /modules/r8169.o  >/dev/null 2>&1 
-insmod /modules/e100.o  >/dev/null 2>&1 
-insmod /modules/e1000.o  >/dev/null 2>&1 
-insmod /modules/sis900.o  >/dev/null 2>&1 
-insmod /modules/via-rhine.o  >/dev/null 2>&1 
-insmod /modules/8139too.o  >/dev/null 2>&1 
-insmod /modules/af_packet.o >/dev/null 2>&1 
-insmod /modules/loop.o >/dev/null 2>&1 
-
-ifconfig lo 127.0.0.1 up
-ifconfig eth0 up
-udhcpc -s /static/udhcpc.sh  >/dev/null 2>&1 
-insmod /modules/fuse.o >/dev/null 2>&1 
-
-echo "The location of dsl.iso is $SRV_IP"
-echo "mounting CDROM"
-mkdir /iso
-httpfs $SRV_IP /iso
-busybox mount -t iso9660 /iso/dsl.iso /cdrom -o loop -o ro
-
-
-#echo "mounting KNOPPIX"
-#mkdir /cdrom/KNOPPIX
-#httpfs $SRV_IP /cdrom/KNOPPIX
+#mounting iso image over HTTP.
+/mount_http_iso.sh $SRV_IP
 
 # test if knoppix is there
 if test -f /cdrom/$KNOPPIX_DIR/$KNOPPIX_NAME
diff --git a/pxeknife/dsl/mount_http_iso.sh b/pxeknife/dsl/mount_http_iso.sh
new file mode 100755
index 0000000..f0aede5
--- /dev/null
+++ b/pxeknife/dsl/mount_http_iso.sh
@@ -0,0 +1,39 @@
+#!/static/sh
+
+echo "HTTP Boot: inserting network modules"
+insmod /modules/crc32.o >/dev/null 2>&1  
+insmod /modules/8390.o  >/dev/null 2>&1 
+insmod /modules/mii.o  >/dev/null 2>&1 
+insmod /modules/ne2k-pci.o  >/dev/null 2>&1 
+insmod /modules/pcnet32.o  >/dev/null 2>&1 
+insmod /modules/r8169.o  >/dev/null 2>&1 
+insmod /modules/e100.o  >/dev/null 2>&1 
+insmod /modules/e1000.o  >/dev/null 2>&1 
+insmod /modules/sis900.o  >/dev/null 2>&1 
+insmod /modules/via-rhine.o  >/dev/null 2>&1 
+insmod /modules/8139too.o  >/dev/null 2>&1 
+insmod /modules/af_packet.o >/dev/null 2>&1 
+insmod /modules/loop.o >/dev/null 2>&1 
+
+ifconfig lo 127.0.0.1 up
+ifconfig eth0 up
+udhcpc -s /static/udhcpc.sh  >/dev/null 2>&1 
+insmod /modules/fuse.o >/dev/null 2>&1 
+
+echo "The location of dsl.iso is $1"
+echo "mounting CDROM"
+mkdir /iso
+httpfs $1 /iso
+busybox mount -t iso9660 /iso/dsl.iso /cdrom -o loop -o ro
+
+
+#echo "mounting KNOPPIX"
+#mkdir /cdrom/KNOPPIX
+#httpfs $SRV_IP /cdrom/KNOPPIX
+
+# test if knoppix is there
+if test -f /cdrom/$KNOPPIX_DIR/$KNOPPIX_NAME
+then
+echo -n "successfully mounted the Image"
+fi
+
-- 
2.17.1