Changeset 219 in MondoRescue for trunk/mindi

Timestamp:

Dec 15, 2005, 2:54:19 AM (18 years ago)

Author:

bcornec

Message:

merge -r176:218 $SVN_M/branches/2.05

Location:

trunk/mindi

Files:

• README.pxe (modified) (2 diffs)
• install.sh (modified) (1 diff)
• mindi (modified) (2 diffs, 1 prop)
• mindi.spec (modified) (2 diffs)
• rootfs/sbin/init (modified) (1 diff)

trunk/mindi/README.pxe

@@ -9 +9 @@
 mondo
         kernel vmlinuz-mondo
-        initrd initrd-mondo pxe [prefix="machine"] ...
+        initrd initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=36864 rw root=/dev/ram iso_mode acpi=off apm=off devfs=nomount exec-shield=0 pxe [prefix="machine"] ...
 
 The initrd and kernel file come rom the first bootable media 
-created by mondoarchive.
-If you mount it you should find what you need under /images
-with a name like mindi-bootroot.8192.img
-initrd is mindi.rdz and kernel is vmlinuz
+created by mondoarchive. To get them, please issue:
 
-Thus the PXE ROM will boot mondo's kernel and mondo's initrd in memory and will append all the right configuration options (as you find in syslinux.cfg on the mindi's floppy image) to which you need to add the keyword pxe.
+# mount /path/to/mondorescue-1.iso /mnt/cdrom -o loop
+# cp -a /mnt/cdrom/vmlinuz /var/tftpboot/vmlinuz-mondo
+# cp -a /mnt/cdrom/initrd.img /var/tftpboot/initrd-mondo
+# umount /mnt/cdrom
+
+Thus the PXE ROM will boot mondo's kernel and mondo's initrd in memory and will append all the right configuration options (as you find in isolinux.cfg on the first bootable media) to which you need to add the keyword pxe.
 (You need to have backup your data using the NFS option of mondoarchive)
 
@@ -26 +28 @@
 
 Please report any problem around that tool to bcornec@users.berlios.de
+
+2005-12-14 detailed explanations on where to find initrd and kernel

trunk/mindi/install.sh

@@ -71 +71 @@
 
 if [ "$ARCH" = "i386" ] ; then
-    (cd $local/sbin && ln -s fdisk parted2fdisk)
+    # FHS requires fdisk under /sbin
+    (cd $local/sbin && ln -s /sbin/fdisk parted2fdisk)
     if [ -f $local/lib/mindi/rootfs/bin/busybox-$ARCH.net ]; then
         echo "Installing busybox.net ..."

trunk/mindi/mindi

@@ -26 +26 @@
     # run this command.
 
-MINDI_VERSION=1.04_berlios
+MINDI_REV=`echo '$Rev$' | awk '{print $2}'`
+
+MINDI_VERSION=1.05-r$MINDI_REV
 MINDI_PREFIX=XXX
 MINDI_CONF=YYY
@@ -63 +65 @@
 USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd usbkbd"
 CDROM_MODS="$TAPE_MODS $FLOPPY_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 sg sr_mod zlib_inflate $USB_MODS $PCMCIA_MODS"
-NET_MODS="sunrpc nfs nfsacl lockd loop e100 bcm5700 e1000 eepro100 tg3"
+NET_MODS="sunrpc nfs nfsacl lockd loop mii e100 bcm5700 e1000 eepro100 tg3 pcnet32"
 EXTRA_MODS="$CDROM_MODS vfat fat loop linear raid0 raid1 raid5 lvm-mod dm-mod jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfsd lockd sunrpc jbd"
 LOGFILE=/var/log/mindi.log

trunk/mindi/mindi.spec

@@ -75 +75 @@
 
 %post
+%{__chmod} 755 %{_libdir}/mindi/aux-tools/sbin/* %{_libdir}/mindi/rootfs/bin/* %{_libdir}/mindi/rootfs/sbin/*
 if [ -f /usr/local/sbin/mindi ]; then
     echo "WARNING: /usr/local/sbin/mindi exists. You should probably remove your manual mindi installation !"
@@ -83 +84 @@
 %config(noreplace) %{_sysconfdir}/mindi/deplist.txt
 %doc CHANGES INSTALL COPYING README TODO README.ia64 README.pxe README.busybox
+%{_mandir}
+%{_libdir}/mindi
+#%attr(755,root,root) %{_libdir}/mindi/aux-tools/sbin/*
+#%attr(755,root,root) %{_libdir}/mindi/rootfs/bin/*
+#%attr(755,root,root) %{_libdir}/mindi/rootfs/sbin/*
 %attr(755,root,root) %{_sbindir}/*
-%{_libdir}/mindi
-%{_mandir}
 
 %changelog

trunk/mindi/rootfs/sbin/init

@@ -638 +638 @@
             done
         fi
-        LogIt "Mounting NFS image $imgname.iso on /mnt/cdrom in loopback"
-        losetup /dev/loop7 /tmp/isodir/$imgname.iso
+        LogIt "Mounting NFS image $imgname-1.iso on /mnt/cdrom in loopback"
+        losetup /dev/loop7 /tmp/isodir/$imgname-1.iso
         mount -t iso9660 /dev/loop7 /mnt/cdrom
         # Simulate a local CD