Changeset 2499 in MondoRescue

Timestamp:

Dec 5, 2009, 5:55:04 PM (15 years ago)

Author:

Bruno Cornec

Message:

nfsopt restore boot time option added to support custom mount options for network restore
(2.2.9.2 backport)

Location:

branches/2.2.10/mindi

Files:

• README.pxe (modified) (3 diffs)
• rootfs/sbin/init (modified) (1 diff)
• rootfs/sbin/start-netfs (modified) (2 diffs)

branches/2.2.10/mindi/README.pxe

@@ -11 +11 @@
 label mondo
         kernel vmlinuz-mondo
-        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=131072 rw root=/dev/ram iso acpi=off apm=off devfs=nomount exec-shield=0 pxe [proto=nfs|sshfs] [prefix=machine] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [netfsmount=server:mountpoint] [netfspath=local_path] [ping=#] ...
+        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=131072 rw root=/dev/ram iso acpi=off apm=off devfs=nomount exec-shield=0 pxe [proto=nfs|sshfs] [prefix=machine] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [netfsmount=server:mountpoint] [netfsopt=-o option][netfspath=local_path] [ping=#] ...
 
 ipdev is the device name (e.g. eth2)
@@ -23 +23 @@
 mountpoint is the mount point on the Remote Network server to use (if NFS, should be in /etc/exports of the NFS server)
 netfsmount is the server and mountpoint on which the ISO is available, if different from the one at backup time. For SSHFS the server part can be of the form user@server.
+netfsopt may contains options passed to the mount command
 netfspath is the local path on the remote server where the image is located, if different from the one at backup time.
 local_path is the local directory under which the mage was made (with the -d option)
@@ -49 +50 @@
 Please report any problem around that tool to bruno@mondorescue.org
 
+2009-12-05 nfsopt added tp allow for custom options at mount time
 2009-09-09 Changed to netfs for multi protocol support (nfs, sshfs, ...)
 2009-05-07 nfspath added to allow redeployment from another NFS directory

branches/2.2.10/mindi/rootfs/sbin/init

@@ -100 +100 @@
     # Doing that is only valid when using a real serial line
     if [ -f $serial ]; then
+        LogIt "Redirecting serial $serial to /dev/tty" 1
         ln -s -f $serial /dev/tty
     fi

branches/2.2.10/mindi/rootfs/sbin/start-netfs

@@ -35 +35 @@
     echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`
     echo $i | grep -qi netfsmount= && export netfsmount=`echo $i | cut -d= -f2`
+    echo $i | grep -qi netfsopt= && export netfsopt=`echo $i | cut -d= -f2`
     echo $i | grep -qi prefix= && export imgname=`echo $i | cut -d= -f2`
     echo $i | grep -qi netfspath= && export dirimg=`echo $i | cut -d= -f2`
@@ -83 +84 @@
         # We need a correct console for ssh
         ln -sf /dev/console /dev/tty
-        sshfs -o ro,StrictHostKeyChecking=no $netfsmount /tmp/isodir
+        sshfs -o ro,StrictHostKeyChecking=no $netfsopt $netfsmount /tmp/isodir
     elif [ "$proto" != "" ]; then
         LogIt "Mounting Network share ($netfsmount) on /tmp/isodir..."
         touch /etc/mtab
-        mount -t $proto -o nolock,ro $netfsmount /tmp/isodir
+        mount -t $proto -o nolock,ro $netfsopt $netfsmount /tmp/isodir
     else
         LogIt "Unknown protocol $proto"