On Thu, Mar 19, 2009 at 06:43:51PM -0600, Allan Lyons wrote:

> I'll see about coming up with a patch to split the stuff between what is 
> required before the network share is mounted and the rest.

Here is the patch that seems to work for me.  I tried to just include what was 
needed before the samba 
share is mounted.

linuxboot/misc/nail-floppy.txt determines what ends up in initrd.  The change 
to linuxboot/Makefile is 
to make sure that two additional empty directories end up in initrd.  (This 
turns out to be the 
"correct" solution to the problem with the dhcp script that was fixed a while 
ago by putting the dhcp 
files into /tmp.)

Allan.
diff --git a/linuxboot/Makefile b/linuxboot/Makefile
index 084d4c0..2828f0b 100644
--- a/linuxboot/Makefile
+++ b/linuxboot/Makefile
@@ -846,7 +846,14 @@ stage1 += stage1/etc/version
 stage1/usr/local:
 	mkdir -p $@
 
-.stamp-stage1: $(stage1) stage1/usr/local
+# we want these standard dirs to exist in the image
+stage1/var/run:
+	mkdir -p $@
+
+stage1/var/tmp:
+	mkdir -p $@
+
+.stamp-stage1: $(stage1) stage1/usr/local stage1/var/run stage1/var/tmp
 	rm -rf stage1/opt/perl/man
 	touch $@
 
diff --git a/linuxboot/misc/nail-floppy.txt b/linuxboot/misc/nail-floppy.txt
index 3bf78dc..ef2c580 100644
--- a/linuxboot/misc/nail-floppy.txt
+++ b/linuxboot/misc/nail-floppy.txt
@@ -4,7 +4,6 @@ init
 
 .dosemu
 
-bin/ash
 bin/bash
 bin/busybox
 bin/find-modules-pci
@@ -17,62 +16,70 @@ bin/sh
 
 etc/extra.pcimap
 etc/ld.so.cache
+etc/ld.so.conf
 etc/master
-etc/version
-
 etc/modprobe.conf
 etc/module-order.txt
 etc/nsswitch.conf
 etc/passwd
 etc/pcmcia
 etc/udhcpc-script
+etc/version
 
-#Make the linuxboot less depent on the linuxaux
-lib
-usr
-
-#lib/ld-linux.so
-#lib/libc.so
-#lib/libcap.so.1 # Samba
-#lib/libm.so
-#lib/libcrypt.so # Samba
-#lib/libdl.so
-#lib/libnsl.so   # Samba
-#lib/libnss_dns.so
-#lib/libnss_files.so
-#lib/libresolv.so
-#lib/librt.so
-#lib/libz.so  # lspci
-
-# Should not hard-wire kernel version here.  FIXME!
-#lib/modules/2.6.25
+lib/firmware
+lib/ld-linux.so
+lib/libc.so
+lib/libcap.so.1
+lib/libm.so
+lib/libcrypt.so
+lib/libdl.so
+lib/libnsl.so
+lib/libnss_dns.so
+lib/libnss_files.so
+lib/libresolv.so
+lib/librt.so
+lib/libz.so
+lib/modules
 
 sbin/acpidump
-sbin/cardmgr
+sbin/depmod
+sbin/generate-modeprobe.conf
 sbin/insmod
 sbin/iwconfig
 sbin/iwlist
 sbin/lspci
+sbin/modinfo
 sbin/modprobe
+sbin/mount.cifs
+sbin/mount.smbfs
+sbin/rmmod
 
-#usr/bin/openvt
+usr/bin/chvt
+usr/bin/kbd_mode
+usr/bin/nano
+usr/bin/openvt
+usr/bin/smbmnt
+usr/bin/smbmount
+usr/bin/smbumount
 
-# Samba junk
-sbin/mount.cifs
-#usr/bin/smbmnt
-#usr/bin/smbmount
-#usr/lib/charset
-#usr/lib/smb.conf
-#usr/lib/lowcase.dat
-#usr/lib/upcase.dat
-#usr/lib/valid.dat
+usr/lib/auth
+usr/lib/charset
+usr/lib/libncursesw.so
+usr/lib/lowcase.dat
+usr/lib/upcase.dat
+usr/lib/smb.conf
+usr/lib/valid.dat
+usr/lib/vfs
 
-#usr/share/keymaps/i386/
-#Some keymaps need include as well
-#usr/share/keymaps/include/
+usr/local
+usr/private
 
-#usr/share/pci.ids
+usr/share/consolefonts
+usr/share/consoletrans
+usr/share/keymaps
+usr/share/pci.ids
 
-#usr/var/locks
+usr/var
 
 var/run
+var/tmp
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
unattended-devel mailing list
unattended-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/unattended-devel

Reply via email to