X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=stage3%2Fcis-ltsp;h=30ed74c371d9558efc67698a190526f4a2c92bb7;hb=0028eaa73ae0c3bd1dbf90c4bd508ae705bc386f;hp=8574edbde0919847f91db48186c6c20f007c3731;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage3/cis-ltsp b/stage3/cis-ltsp
index 8574edb..30ed74c 100755
--- a/stage3/cis-ltsp
+++ b/stage3/cis-ltsp
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -o errexit
 
 # 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
-	rm -v -rf /srv/tftpboot || exit 1
+	rm -v -rf /srv/tftpboot
     fi
 
-    mv -v /tftpboot /srv/tftpboot || exit 1
+    mv -v /tftpboot /srv/tftpboot
 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
@@ -59,18 +60,18 @@ cat > ${LTSROOT}/etc/lts.conf << "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" \
-    ${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.
-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.