X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-terminalserver;fp=grml-terminalserver;h=d736a8c4d41f84d7694214237a4600c19ec75022;hb=fdea9e5736375443ad3818136cab0bc41f9d9414;hp=82656f229ed6cd2ff9afb8e5d4dbb581c33a12c5;hpb=0477e926a3886e62258244e86265915aaa2f449a;p=grml-terminalserver.git diff --git a/grml-terminalserver b/grml-terminalserver index 82656f2..d736a8c 100755 --- a/grml-terminalserver +++ b/grml-terminalserver @@ -211,9 +211,9 @@ function createTftpConf else execute "install -m 644 $KERNEL_IMAGE_ $TFTPD_DATA_DIR_/linux26" die fi - execute "install -m 644 $MEMTEST_IMAGE_ $TFTPD_DATA_DIR_/memtest" die + [ -f "$MEMTEST_IMAGE" ] && execute "install -m 644 $MEMTEST_IMAGE_ $TFTPD_DATA_DIR_/memtest" die execute "install -m 644 $PXE_BOOT_MSG_ $TFTPD_DATA_DIR_" die - execute "install -m 644 $PXE_BOOT_LOGO_ $TFTPD_DATA_DIR_" die + [ -f "$PXE_BOOT_LOGO_" ] && execute "install -m 644 $PXE_BOOT_LOGO_ $TFTPD_DATA_DIR_" die execute "source $TEMPLATE_CONFIG_DIR_/grub-pxelinux_config" die } @@ -240,12 +240,12 @@ function runTftp # NFS {{{ function createNfsConfig { - execute "exportfs -o ro,no_root_squash,async,nohide $NETWORK_/$NETMASK_:$MOUNT_POINT_" warn + execute "exportfs -o ro,no_root_squash,async,nohide,fsid=42 $NETWORK_/$NETMASK_:$MOUNT_POINT_" warn } function removeNfsConfig { - execute "exportfs -u -o ro,no_root_squash,async,nohide $NETWORK_/$NETMASK_:$MOUNT_POINT_" warn + execute "exportfs -u -o ro,no_root_squash,async,nohide,fsid=42 $NETWORK_/$NETMASK_:$MOUNT_POINT_" warn } function startNfs