Changeset 3261


Ignore:
Timestamp:
Mar 30, 2014, 4:18:24 AM (5 years ago)
Author:
bruno
Message:
  • Remove now unneeded modules from net module list
  • Fix perl usage typos
  • Fix some error msgs
Location:
branches/3.2/mindi
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3257 r3261  
    6868PCMCIA_MODS="pcmcia_core ds yenta_socket"
    6969USB_MODS="usb-storage usb_storage usb-ohci usb-uhci input hid uhci_hcd uhci-hcd ehci-hcd ehci-pci ohci-hcd ohci_hcd ohci-pci xhci xhci-hcd usbkbd usbhid keybdev mousedev scsi_mod ff-memless ums_cypress ums-cypress cp210x usbserial"
    70 NET_MODS="nfs loop mii 3c59x e100 bcm5700 cnic be2net bnx2 bnx2x bnx2i mdio e1000 e1000e igb dca eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmxnet3 vmnet exportfs fuse netbk xenblktap r8169 virtio_net via_rhine ipv6 ptp"
     70NET_MODS="nfs nfsv2 nfsv3 nfsv4 nfsd loop mii 3c59x e100 bcm5700 cnic be2net bnx2 bnx2x bnx2i mdio e1000 e1000e igb dca eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmxnet3 vmnet exportfs fuse netbk xenblktap r8169 virtio_net via_rhine ipv6 ptp"
    7171CDROM_MODS="$TAPE_MODS $IDE_MODS $USB_MODS $PCMCIA_MODS $SCSI_MODS $NET_MODS cdrom isocd isofs sg sr_mod iso9660 vfat fat"
    7272# Those modules will only go on the backup media, not the boot media.
     
    491491FindLdlinux32Binary() {
    492492    LDLINUXC32=/usr/lib/syslinux/ldlinux.c32
    493     [ ! -e "$LDLINUXC32" ] && LDLINUXC32=/usr/lib/syslinux/ldlinux.c32
    494493    [ ! -e "$LDLINUXC32" ] && LDLINUXC32=/usr/lib64/syslinux/ldlinux.c32
    495494    [ ! -e "$LDLINUXC32" ] && LDLINUXC32=/usr/share/syslinux/ldlinux.c32
     
    508507FindMboot32Binary() {
    509508    MBOOTC32=/usr/lib/syslinux/mboot.c32
    510     [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/lib/syslinux/mboot.c32
    511509    [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/lib64/syslinux/mboot.c32
    512510    [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/share/syslinux/mboot.c32
     
    880878    while [ `echo $file | grep -Ec '\.\./'` -ne 0 ]; do
    881879        # We need to normalise the path with .. in it
    882         file=`echo $file | perl -pi -e 's|([^/]*)/([^/]+)/\.\./([^/]+)|$1/$3|g'`
     880        file=`echo $file | perl -p -e 's|([^/]*)/([^/]+)/\.\./([^/]+)|$1/$3|g'`
    883881    done
    884882    echo "$file"
     
    15041502    if [ _"$MONDO_SHARE" != _"" ]; then
    15051503        if [ $KERNEL_IS_XEN = "yes" ]; then
    1506             cp $xenkernelpath $MONDO_ROOT/xen.gz 2>> $LOGFILE || Die "Cannot copy xen.gz ($xenkernelpath) to mindi tmp ($MONDO_ROOT/iso/xen.gz). Did you run out of disk space?"
    1507             cp $MBOOTC32 $MONDO_ROOT/mboot.c32  2>> $LOGFILE || Die "Cannot copy mboot.c32 ($MBOOTC32) to mindi tmp ($MONDO_ROOT/iso/mboot.c32). Did you run out of disk space?"
     1504            cp $xenkernelpath $MONDO_ROOT/xen.gz 2>> $LOGFILE || Die "Cannot copy xen.gz ($xenkernelpath) to mindi tmp ($MONDO_ROOT/xen.gz). Did you run out of disk space?"
     1505            cp $MBOOTC32 $MONDO_ROOT/mboot.c32  2>> $LOGFILE || Die "Cannot copy mboot.c32 ($MBOOTC32) to mindi tmp ($MONDO_ROOT/mboot.c32). Did you run out of disk space?"
    15081506        fi
    15091507        if [ -e $LDLINUXC32 ]; then
    1510             cp $LDLINUXC32 $MONDO_ROOT/iso/ldlinux.c32  2>> $LOGFILE || Die "Cannot copy ldlinux.c32 ($LDLINUXC32) to $MONDO_ROOT/iso/ldlinux.c32. Did you run out of disk space?"
     1508            cp $LDLINUXC32 $MONDO_ROOT/ldlinux.c32  2>> $LOGFILE || Die "Cannot copy ldlinux.c32 ($LDLINUXC32) to $MONDO_ROOT/ldlinux.c32. Did you run out of disk space?"
    15111509        fi
    15121510        cp $kernelpath $MONDO_ROOT/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
     
    25982596        if [ -e "/lib/udev" ] && [ ! -h "/lib" ] && [  ! -h "/lib/udev" ]; then
    25992597            tar cf - -C / /lib/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "ERROR: Problem in /lib/udev analysis" $MINDI_TMP/$$.log
     2598        fi
     2599        if [ -e "/usr/lib/udev" ] && [ ! -h "/usr/lib" ] && [  ! -h "/usr/lib/udev" ]; then
     2600            tar cf - -C / /usr/lib/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "ERROR: Problem in /usr/lib/udev analysis" $MINDI_TMP/$$.log
    26002601        fi
    26012602        if [ -x /sbin/udevd ] || [ -x /usr/bin/udevd ] || [ -x /usr/lib/systemd/systemd-udevd ]; then
  • branches/3.2/mindi/rootfs/usr/sbin/start-netfs

    r3216 r3261  
    118118    elif [ "$proto" != "" ]; then
    119119        if [ -x /sbin/rpcbind ]; then
    120             "Startng rpcbind daemon..."
    121             /sbin/rpcbind &
     120            "Starting rpcbind daemon..."
     121            /sbin/rpcbind -w &
    122122        fi
    123123        LogIt "Mounting Network share ($netfsmount) on /tmp/isodir..."
Note: See TracChangeset for help on using the changeset viewer.