[prev in list] [next in list] [prev in thread] [next in thread]
List: ipcop-svn
Subject: [Ipcop-svn] SF.net SVN: ipcop: [364] ipcop/trunk
From: chepati () users ! sourceforge ! net
Date: 2007-05-23 19:12:25
Message-ID: E1HqwG1-0008VC-BH () sc8-pr-svn4 ! sourceforge ! net
[Download RAW message or body]
Revision: 364
http://ipcop.svn.sourceforge.net/ipcop/?rev=364&view=rev
Author: chepati
Date: 2007-05-23 12:12:25 -0700 (Wed, 23 May 2007)
Log Message:
-----------
Ok, been meaning to commit this for a few weeks. squashfs without lzma compression \
is marginally better (or often slightly worse) than gzip. lzma compression only \
works for x86. So there's no real benefit to all ipcop-supported architectures in \
using squashfs. Therefore I suggest we use initramfs as it's emerging as a viable \
replacement for initrd, works on all architectures and offers flexibility. I've \
tested initramfs on x86, ppc and sparc and they all work fine. The only remaining \
issue is getting floppy installation working with initramfs, which I did almost two \
months ago, but haven't pursued since. I'll do that next and then we'll have the \
same functionality using initramfs as we currently have with squashfs. I also \
changed the installer to do hard disk detection before cdrom detection because I had \
a problem where the cdrom became /dev/hda and the harddisk /dev/hdc. Rearranging \
detection didn't really help. There's a similar problem in ppc, but a kernel optio \
n in IDE subsystem fixes it. I'll need to spend some more work on this.
Modified Paths:
--------------
ipcop/trunk/config/i486/syslinux.cfg
ipcop/trunk/config/install/fstab
ipcop/trunk/config/install/rc
ipcop/trunk/lfs/initrd
ipcop/trunk/src/installer/main.c
Added Paths:
-----------
ipcop/trunk/config/install/init
Modified: ipcop/trunk/config/i486/syslinux.cfg
===================================================================
--- ipcop/trunk/config/i486/syslinux.cfg 2007-05-23 18:29:47 UTC (rev 363)
+++ ipcop/trunk/config/i486/syslinux.cfg 2007-05-23 19:12:25 UTC (rev 364)
@@ -5,16 +5,16 @@
LABEL install
KERNEL vmlinuz
- APPEND ide=nodma initrd=instroot.img root=/dev/ram0 rw
+ APPEND initrd=instroot.img ide=nodma
LABEL nopcmcia
KERNEL vmlinuz
- APPEND ide=nodma initrd=instroot.img root=/dev/ram0 rw nopcmcia
+ APPEND initrd=instroot.img ide=nodma nopcmcia
LABEL nousb
KERNEL vmlinuz
- APPEND ide=nodma initrd=instroot.img root=/dev/ram0 rw nousb
+ APPEND initrd=instroot.img ide=nodma nousb
LABEL nousborpcmcia
KERNEL vmlinuz
- APPEND ide=nodma initrd=instroot.img root=/dev/ram0 rw nousb nopcmcia
+ APPEND initrd=instroot.img ide=nodma nousb nopcmcia
LABEL dma
KERNEL vmlinuz
- APPEND initrd=instroot root=/dev/ram0 rw
+ APPEND initrd=instroot
Modified: ipcop/trunk/config/install/fstab
===================================================================
--- ipcop/trunk/config/install/fstab 2007-05-23 18:29:47 UTC (rev 363)
+++ ipcop/trunk/config/install/fstab 2007-05-23 19:12:25 UTC (rev 364)
@@ -1,5 +1,3 @@
-/dev/ram0 / squashfs
-/dev/fd0 / squashfs
/proc /proc proc
none /sys sysfs
none /tmp tmpfs
Added: ipcop/trunk/config/install/init
===================================================================
--- ipcop/trunk/config/install/init (rev 0)
+++ ipcop/trunk/config/install/init 2007-05-23 19:12:25 UTC (rev 364)
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+exec busybox init
Property changes on: ipcop/trunk/config/install/init
___________________________________________________________________
Name: svn:executable
+ *
Modified: ipcop/trunk/config/install/rc
===================================================================
--- ipcop/trunk/config/install/rc 2007-05-23 18:29:47 UTC (rev 363)
+++ ipcop/trunk/config/install/rc 2007-05-23 19:12:25 UTC (rev 364)
@@ -1,10 +1,5 @@
#!/bin/ash
-echo -ne "Mounting /tmp ... "
-mount -n -t tmpfs tmpfs /tmp -o mode=1777
-cp /etc/fstab.boot /tmp/fstab
-echo "Done"
-
echo -ne "Mounting /proc ... "
mount -n -t proc none /proc
echo "Done"
@@ -43,10 +38,6 @@
mount -n -t devpts devpts /dev/pts
echo "Done"
-echo -ne "Mounting /root ... "
-mount -n -t ramfs none /root
-echo "Done"
-
echo -ne "Starting syslogd ... "
syslogd -O /dev/tty4
echo "Done"
Modified: ipcop/trunk/lfs/initrd
===================================================================
--- ipcop/trunk/lfs/initrd 2007-05-23 18:29:47 UTC (rev 363)
+++ ipcop/trunk/lfs/initrd 2007-05-23 19:12:25 UTC (rev 364)
@@ -67,8 +67,7 @@
# Finish up initrd directory
cd $(INSTALLER_DIR)/initrd/etc && rm -f fstab
cp -aRf $(DIR_SRC)/config/install/* $(INSTALLER_DIR)/initrd/etc/
- mv -f $(INSTALLER_DIR)/initrd/etc/fstab $(INSTALLER_DIR)/initrd/etc/fstab.boot
- cd $(INSTALLER_DIR)/initrd/etc && ln -s /tmp/fstab fstab
+ cd $(INSTALLER_DIR)/initrd && mv etc/init .
rm -rf $(INSTALLER_DIR)/initrd/etc{,/udev,/udev/rules.d}/.svn
rm -rf $(INSTALLER_DIR)/initrd/usr/share/man
chmod 755 $(INSTALLER_DIR)/initrd/etc/halt $(INSTALLER_DIR)/initrd/etc/rc
@@ -141,8 +140,7 @@
cd $(INSTALLER_DIR)/mnt && lzma d $(INSTALLER_DIR)/images/drivers-$(VERSION).img \
-so | tar xf - cd $(INSTALLER_DIR)/mnt && lzma d \
$(INSTALLER_DIR)/images/scsidrv-$(VERSION).img -so | tar xf - touch \
$(INSTALLER_DIR)/mnt/CDROMBOOT
- mksquashfs $(INSTALLER_DIR)/mnt $(INSTALLER_DIR)/images/cdinitrd.img
+ cd $(INSTALLER_DIR)/mnt && find . | cpio -o -H newc | gzip -9 > \
$(INSTALLER_DIR)/images/cdinitrd.img
rm -rf $(INSTALLER_DIR)/mnt/*
-
@$(POSTBUILD)
Modified: ipcop/trunk/src/installer/main.c
===================================================================
--- ipcop/trunk/src/installer/main.c 2007-05-23 18:29:47 UTC (rev 363)
+++ ipcop/trunk/src/installer/main.c 2007-05-23 19:12:25 UTC (rev 364)
@@ -305,27 +305,6 @@
fprintf(flog, "Probing network cards\n");
probehw(hw_network_ctrl);
- mysystem("modprobe usb-storage");
- mysystem("modprobe sr_mod");
- mysystem("modprobe ide-cd");
-
- fprintf(flog, "Probing CD/DVD drives\n");
- //CHECK: hd_list returns really the head AND add tohd_data???
- hd = hd_list(hd_data, hw_cdrom, 1, NULL);
- for (i = 0; hd; hd = hd->next, i++)
- {
- fprintf(flog, "DevName %s\n", hd->unix_dev_name);
- fprintf(flog, "Model %s\n", hd->model);
- if (hd->detail && hd->detail->type == hd_detail_scsi)
- scsi = 1;
- cdromlist = realloc(cdromlist, sizeof(char *) * (i + 1));
- cdromlist[i] = strdup (hd->unix_dev_name);
- }
- /* end with a null pointer */
- cdromlist = realloc(cdromlist, sizeof(char *) * (i + 1));
- cdromlist[i] = NULL;
- hd_free_hd_list(hd); /* free it */
-
mysystem("modprobe sd_mod");
mysystem("modprobe ide-disk");
@@ -350,6 +329,28 @@
harddisklist[i] = NULL;
hd_free_hd_list(hd); /* free it */
+ mysystem("modprobe usb-storage");
+ mysystem("modprobe sr_mod");
+ mysystem("modprobe ide-cd");
+
+ fprintf(flog, "Probing CD/DVD drives\n");
+ //CHECK: hd_list returns really the head AND add tohd_data???
+ hd = hd_list(hd_data, hw_cdrom, 1, NULL);
+ for (i = 0; hd; hd = hd->next, i++)
+ {
+ fprintf(flog, "DevName %s\n", hd->unix_dev_name);
+ fprintf(flog, "Model %s\n", hd->model);
+ if (hd->detail && hd->detail->type == hd_detail_scsi)
+ scsi = 1;
+ cdromlist = realloc(cdromlist, sizeof(char *) * (i + 1));
+ cdromlist[i] = strdup (hd->unix_dev_name);
+ }
+ /* end with a null pointer */
+ cdromlist = realloc(cdromlist, sizeof(char *) * (i + 1));
+ cdromlist[i] = NULL;
+ hd_free_hd_list(hd); /* free it */
+
+
mysystem("modprobe ide-floppy");
fprintf(flog, "Probing Floppy Disk drives\n");
@@ -1112,7 +1113,7 @@
/*TR*/
statuswindow(60, 4, TITLE, gettext("TR_MAKING_FILESYSTEMS"));
- if ((handle=fopen("/tmp/fstab", "w")))
+ if ((handle=fopen("/etc/fstab", "w")))
{
for (i = 0; i < numpartitions; i++)
{
@@ -1215,7 +1216,8 @@
if (!bigdisk)
strcat (bigstring, " --nosquashfs");
strcat (bigstring, " --with=ext3 --with=scsi_mod --with=sd_mod --with=sr_mod \
--with=libata");
- strcat (bigstring, " --with-usb --fstab=" CONFIG_ROOT "/etc/fstab");
+ strcat (bigstring, " --with=ohci-hcd --with=uhci-hcd --with=ehci-hcd \
--with=usbhid"); + strcat (bigstring, " --fstab=" CONFIG_ROOT "/etc/fstab");
//add each module ...
for (i = 0; i < nummodules; i++)
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic