projects
/
grml-terminalserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/mru/issue733'
[grml-terminalserver.git]
/
grml-terminalserver
diff --git
a/grml-terminalserver
b/grml-terminalserver
index
3c6b07f
..
d736a8c
100755
(executable)
--- a/
grml-terminalserver
+++ b/
grml-terminalserver
@@
-110,8
+110,12
@@
function stopDhcp
{
start-stop-daemon --stop --quiet --pidfile "$DHCPD_PID_"
rm -f $DHCPD_PID_
{
start-stop-daemon --stop --quiet --pidfile "$DHCPD_PID_"
rm -f $DHCPD_PID_
+ # ugly but necessary :-/
find /var/lib/dhcp* -type f -name dhcpd.leases -delete
find /var/lib/dhcp* -type f -name dhcpd.leases -delete
- touch /var/lib/dhcp*/dhcpd.leases
+ local dhcpdir
+ for dhcpdir in /var/lib/dhcp* ; do
+ touch ${dhcpdir}/dhcpd.leases
+ done
}
function startDhcp
}
function startDhcp
@@
-207,9
+211,9
@@
function createTftpConf
else
execute "install -m 644 $KERNEL_IMAGE_ $TFTPD_DATA_DIR_/linux26" die
fi
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_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
}
execute "source $TEMPLATE_CONFIG_DIR_/grub-pxelinux_config" die
}
@@
-236,12
+240,12
@@
function runTftp
# NFS {{{
function createNfsConfig
{
# 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
{
}
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
}
function startNfs