* added support for new cmdline option '--use-absolute-tftp-path' which causes

  the demuxer to pass on the absolute tftp-path to the client (via kernel
  cmdline argument 'tftp_root_path=...'


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@418 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 12 insertions, 1 deletions

diff --git a/config-db/slxconfig-demuxer.pl b/config-db/slxconfig-demuxer.pl
index 6ac7be75..8e610f70 100755
--- a/config-db/slxconfig-demuxer.pl
+++ b/config-db/slxconfig-demuxer.pl
@@ -26,6 +26,8 @@ MENU MASTER PASSWD secret
 my (
 	$dryRun,
 		# dryRun won't touch any file
+	$useAbsoluteTftpPath,
+		# pass tftpboot-path on to clients (for a tftpd serving from "/")
 	$systemConfCount,
 		# number of system configurations written
 	$clientSystemConfCount,
@@ -33,9 +35,13 @@ my (
 );
 
 GetOptions(
-	'dry-run' => \$dryRun
+	'dry-run' => \$dryRun,
 		# dry-run doesn't write anything, just prints statistic about what
 		# would have been written
+	'use-absolute-tftp-path' => \$useAbsoluteTftpPath,
+		# this causes the absolute tftp-path to be prepended to all places
+		# that require it such that the system can cooperate with a tftp-server
+		# which does not serve from $SLX_TFTPBOOT_PATH (but from / instead).
 );
 
 openslxInit();
@@ -207,6 +213,11 @@ sub writePXEMenus
 				$append .= " initrd=$extSysID/initramfs";
 				$append .= " $clientAppend";
 				$append .= " rootfs=$info->{'export-uri'} file";
+				if ($useAbsoluteTftpPath) {
+					# tftp-server requires absolute paths, so we pass that on to
+					# the clients:
+					$append .= " tftp_root_path=$tftpbootPath";
+				}
 				print PXE "LABEL openslx-$extSysID\n";
 #				print PXE "\tMENU DEFAULT\n";
 				print PXE "\tMENU LABEL ^$info->{label}\n";