Changeset 3327 in MondoRescue

Timestamp:

Dec 3, 2014, 9:57:24 PM (9 years ago)

Author:

Bruno Cornec

Message:

Backports from 3.2:

• Launch start-netfs when a network conf is detected in the conf file to avoid an error later on in automatic mode
• Improve description of -k option of mondoarchive and give an example

Location:

branches/3.0

Files:

• mindi/rootfs/etc/init.d/rcS (modified) (2 diffs)
• mondo-doc/mondoarchive.8 (modified) (2 diffs)

branches/3.0/mindi/rootfs/etc/init.d/rcS

@@ -965 +965 @@
     LogIt "Warning - /tmp/mondo-restore.cfg not found"
 fi
-if [ "`grep -i pxe /proc/cmdline`" ] || [ "`grep -i net /proc/cmdline`" ]; then
+if [ "`grep -i pxe /proc/cmdline`" ] || [ "`grep -i net /proc/cmdline`" ] || [ "`grep 'netfs-proto ' /tmp/mondo-restore.cfg`" ]; then
     # We need to get here exported variables from start-netfs
     . /sbin/start-netfs
@@ -990 +990 @@
     HandleCDROM
     ExtractDataDisksAndLoadModules
-    # We need to get here exported variables from start-netfs
-    . /sbin/start-netfs
 fi
 res=$?

branches/3.0/mondo-doc/mondoarchive.8

@@ -223 +223 @@
 .TP
 .BI "\-k " "path"
-Path of user's kernel. If you are a Debian (<3.0) or Gentoo (<1.4) user then specify
+Full path name of the kernel to use. Generally your native kernel should be 
+found and work appropriately. Otherwise, you may use this option to point to 
+another one. E.g. '\-k /boot/myvmlinuz'. 
+If you are a Debian (<3.0) or Gentoo (<1.4) user then specify
 .B \-k FAILSAFE
 as your kernel. Otherwise, you will rarely need this option.
@@ -304 +307 @@
 that afio is not free enough due to its age and old licenses (wrongly in our
 opinion). Star can be used to have a better support of sparse file compared to
-afio. Also star supports natively POSIX ACLs, where as afio requires a special 
+afio. Also star supports natively POSIX ACLs, whereas afio requires a special 
 additional handlling.