projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-Fixed bug when moving "mv" command from /usr/bin to /bin
[hvlinux.git]
/
stage3
/
cis-ltsp
diff --git
a/stage3/cis-ltsp
b/stage3/cis-ltsp
index
8574edb
..
30ed74c
100755
(executable)
--- a/
stage3/cis-ltsp
+++ b/
stage3/cis-ltsp
@@
-1,4
+1,5
@@
#!/bin/sh
#!/bin/sh
+set -o errexit
# Reading system configuration informations, functions and package versions.
source ../sysinfos
# Reading system configuration informations, functions and package versions.
source ../sysinfos
@@
-12,16
+13,16
@@
LTSP_SERVER="192.168.0.4"
if [ -d /tftpboot ]; then
if [ -d /srv/tftpboot ]; then
if [ -d /tftpboot ]; then
if [ -d /srv/tftpboot ]; then
- rm -v -rf /srv/tftpboot
|| exit 1
+ rm -v -rf /srv/tftpboot
fi
fi
- mv -v /tftpboot /srv/tftpboot
|| exit 1
+ mv -v /tftpboot /srv/tftpboot
fi
fi
-cd /srv/tftpboot/lts/${LTSP_KERNEL}/pxelinux.cfg
&&
-ln -v -s -f default ${MAC_ADDRESS}
&&
+cd /srv/tftpboot/lts/${LTSP_KERNEL}/pxelinux.cfg
+ln -v -s -f default ${MAC_ADDRESS}
-cat > ${LTSROOT}/etc/lts.conf << "EOF"
&&
+cat > ${LTSROOT}/etc/lts.conf << "EOF"
[Default]
# Uncomment to use custom XF86Config:
### XF86CONFIG_FILE = /tmp/XF86Config.1
[Default]
# Uncomment to use custom XF86Config:
### XF86CONFIG_FILE = /tmp/XF86Config.1
@@
-59,18
+60,18
@@
cat > ${LTSROOT}/etc/lts.conf << "EOF" &&
SOUND_DAEMON = esd
EOF
SOUND_DAEMON = esd
EOF
-sed -i -e "s!_LTSP_SERVER_!${LTSP_SERVER}!g" ${LTSROOT}/etc/lts.conf
&&
+sed -i -e "s!_LTSP_SERVER_!${LTSP_SERVER}!g" ${LTSROOT}/etc/lts.conf
# LTSP-4.2 update 4: The "-public" option is absolutely necessary...
sed -i -e "s!\( */bin/esd -nobeeps -tcp -port 16001\)\( -as 1 &\)!\1 -public\2!g" \
# LTSP-4.2 update 4: The "-public" option is absolutely necessary...
sed -i -e "s!\( */bin/esd -nobeeps -tcp -port 16001\)\( -as 1 &\)!\1 -public\2!g" \
- ${LTSROOT}/etc/rc.sound
&&
+ ${LTSROOT}/etc/rc.sound
-string_add "${LTSROOT} 192.168.0.0/24(rw,sync,no_root_squash)" /etc/exports
&&
+string_add "${LTSROOT} 192.168.0.0/24(rw,sync,no_root_squash)" /etc/exports
-string_add "option root-path \"${LTSP_SERVER}:${LTSROOT}\";" /etc/dhcpd.conf
&&
+string_add "option root-path \"${LTSP_SERVER}:${LTSROOT}\";" /etc/dhcpd.conf
# no spaces but tabs to separate items.
# no spaces but tabs to separate items.
-sed -i -e "s!^#\*\(.*#any host.*\)!\*\1!g" /etc/X11/xdm/Xaccess
&&
+sed -i -e "s!^#\*\(.*#any host.*\)!\*\1!g" /etc/X11/xdm/Xaccess
# By default this line is set, so that it is not listening to XDMCP connection.
# This is for security reasons.
# By default this line is set, so that it is not listening to XDMCP connection.
# This is for security reasons.