WebSVN – livecd – Diff – /trunk/customize-livecd.sh

+#
 # Urs Beyerle, PSI
+#
 ###############################################################
-# source livecd.conf
+### source livecd.conf
 . livecd.conf
 ###############################################################
 function usage() {
             usage; exit;;
     esac
 done
 ### arch x86_64 or i686 ?
 ARCH=$( /bin/arch )
 [ "$ARCH" != "x86_64" ] && ARCH=i686
-### Local username
+### set local username for PSI
-if [ $PSI ]; then
-    LOCALUSER=l_psi
+[ $PSI ] && LOCALUSER=l_psi
-else
-    LOCALUSER=sluser
-fi
 ###############################################################
 # Backup some original files
 ###############################################################
 ###############################################################
 echo "Configure system ..."
 # build nvidia kernel modules
-if [ -x /usr/sbin/mknvidia ]; then
+[ -x /usr/sbin/mknvidia ] && mknvidia
-    mknvidia
-fi
 # build vpnclient kernel module
-if [ -x /usr/sbin/mkvpnclient ]; then
+[ -x /usr/sbin/mkvpnclient ] && mkvpnclient
-    mkvpnclient
-fi
 # Update Virus definitions
 # run freshclam
 if [ -x /usr/bin/freshclam ]; then
     echo; echo "Run /usr/bin/freshclam:"
     mv /opt /usr/
     ln -s /usr/opt /opt
 fi
 # umount PSI master
-if [ $PSI ]; then
-    umount /mnt/master 2>/dev/null
+[ $PSI ] && umount /mnt/master 2>/dev/null
-fi
 # copy back /etc/yum.repos.d
 if [ ! $PSI ]; then
     if [ -d /etc/yum.repos.d.ori ]; then
 	cp -a /etc/yum.repos.d.ori /etc/yum.repos.d
 ### remove root passwd
 sed -i "s|^root:.*|root:\*:12943:0:99999:7:::|" /etc/shadow
 sed -i "s|^root:.*:0:0|root:x:0:0|" /etc/passwd
 ### remove /.autofsck
-rm -rf /.autofsck
+rm -f /.autofsck
 ### disable cfagent
 rm -f /etc/cron.d/cfengine
 ### disable check_update in rc.local.psi
-if [ $PSI ]; then
-    sed -i "s|/etc/init.d/check_update|# /etc/init.d/check_update|" /etc/rc.d/rc.local.psi
+[ $PSI ] && sed -i "s|/etc/init.d/check_update|# /etc/init.d/check_update|" /etc/rc.d/rc.local.psi
-fi
 ### create in /boot link to LiveCD kernel(s)
 ln -fs /boot/vmlinuz-$KERNEL /boot/vmlinuz
 [ $SMP ] && ln -fs /boot/vmlinuz-${KERNEL}smp /boot/vmlinuz${SMP}
               /etc/ssh/ssh_host_key.pub \
               /etc/ssh/ssh_host_rsa_key.pub \
               /etc/ssh/ssh_host_dsa_key \
               /etc/ssh/ssh_host_dsa_key.pub"
 for file in $FILES_REMOVE; do
-    rm -rf $file
+    rm -f $file
 done
 ### remove useless cronjobs
 mkdir -p /etc/cron_backup
 mv /etc/cron.d/sysstat /etc/cron_backup/ 2>/dev/null
 mv /etc/cron.daily/yum.cron /etc/cron_backup/ 2>/dev/null
 mv /etc/cron.daily/prelink /etc/cron_backup/ 2>/dev/null
 mv /etc/cron.daily/00-logwatch /etc/cron_backup/ 2>/dev/null
 ### remove desktop entry from crossover
-if [ $PSI ]; then
-    rm -rf "/usr/share/apps/kdesktop/DesktopLinks/Internet Explorer.desktop"
+[ $PSI ] && rm -f "/usr/share/apps/kdesktop/DesktopLinks/Internet Explorer.desktop"
-fi
 ### remove backup of /etc/X11/xorg.conf
 rm -f /etc/X11/xorg.conf.ori 2>/dev/null
 rm -f /etc/X11/xorg.conf.backup 2>/dev/null
 ###############################################################
 echo "Modify files ..."
 ### remove AFS startup warning about cache
-if [ $PSI ]; then
-    sed  -i "/\!\!\!/d" /etc/init.d/afs
+[ $PSI ] && sed  -i "/\!\!\!/d" /etc/init.d/afs
-fi
 ### disable umount of loop device during shutdown
 #   this is done really dirty at the moment:
 #    -> just replace "loop" with non existing device "lo_fake"
 ### source /etc/sysconfig/cfengine
 [ $PSI ] && . /etc/sysconfig/cfengine
 ### Set /etc/motd
-if [ "$ARCH" = "x86_64" ]; then
-    LiveCD="LiveCD 64bit"
+LiveCD="LiveCD"
-else
-    LiveCD="LiveCD"
+[ "$ARCH" = "x86_64" ] && LiveCD="LiveCD 64bit"
-fi
-if [ $PSI ]; then
-    echo "Welcome to PSI ${LiveCD} (${CLASS} ${SUBCLASS} SL${RELEASE})" > /etc/motd
+echo "Welcome to $LIVECD_OS ${LiveCD}" > /etc/motd
-else
-    echo "Welcome to $LIVECD_OS ${LiveCD}" > /etc/motd
+[ $PSI ] && echo "Welcome to PSI ${LiveCD} (${CLASS} ${SUBCLASS} SL${RELEASE})" > /etc/motd
-fi
 ### Set hostname to psi or slinux (not really necessary)
 if [ $PSI ]; then
     HOSTNAME="psi"
     sed -i "s/hostname=.*/hostname=${HOSTNAME}.psi.ch/" /etc/ssmtp/ssmtp.conf
     sed -i "s/HOSTNAME=.*/HOSTNAME=${HOSTNAME}/" /etc/sysconfig/cfengine
 else
-    HOSTNAME="slinux"
+    HOSTNAME="$DEFAULT_HOSTNAME"
 fi
 # change hostname
 sed -i "s/HOSTNAME=.*/HOSTNAME=${HOSTNAME}/" /etc/sysconfig/network
 sed -i "s/DHCP_HOSTNAME=.*/DHCP_HOSTNAME==${HOSTNAME}/" /etc/sysconfig/networking/devices/ifcfg-eth0 2>/dev/null
 ADD=" - LiveCD"
 grep -q "$ADD" /etc/redhat-release
 if [ "$?" != "0" ]; then
     echo "$( cat /etc/redhat-release )${ADD}" > /etc/redhat-release
 fi
-if [ $DVD ]; then
-    sed -i "s|CD|DVD|" /etc/redhat-release
+[ $DVD ] && sed -i "s|CD|DVD|" /etc/redhat-release
-fi
 ### Make scratch
 if [ $PSI ]; then
     rm -rf /home/scratch
     mkdir -p /home/scratch
     cp -a customize/psi/psi-scanvirus /usr/bin/
     [ -d /usr/local/uvscan ] && cp -a customize/psi/update-dat /usr/local/uvscan/
     [ -x /usr/bin/freshclam ] && cp -a customize/psi/psi-freshclam /usr/bin/
 fi
-### scripts to install LiveCD on local harddisk
+### script to install LiveCD on local harddisk
 cp -a customize/livecd-install  /usr/sbin/
-### get livecd-mkinitrd (used by livecd-install)
+### livecd-mkinitrd (used by livecd-install)
 if [ -e customize/sl${OS_RELEASE}/livecd-mkinitrd ]; then
     cp -a customize/sl${OS_RELEASE}/livecd-mkinitrd /usr/sbin/
 else
     cp -a /sbin/mkinitrd /usr/sbin/livecd-mkinitrd
 fi
 # Configure services
 ###############################################################
 echo "Configure services ..."
-# services off
+### services off
 if [ $PSI ]; then
     chkconfig cfenvd off 2>/dev/null
     chkconfig cfexecd off 2>/dev/null
     chkconfig cfservd off 2>/dev/null
 fi
 # we do kudzu-auto
 chkconfig kudzu off
-# services on
+### services on
 if [ $PSI ]; then
     chkconfig vpnclient_init on 2>/dev/null
 fi
 if [ ! "$SERVICES_ON" = "" ]; then
 if [ -x /etc/cron_backup/prelink ]; then
     echo "Run prelink..."
     /etc/cron_backup/prelink
     echo "done."
 fi
-# clean log
+### clean prelink log
 rm -f /var/log/prelink/prelink.log 2>/dev/null
 rm -f /var/log/prelink.log 2>/dev/null
 ### run makewhatis
 if [ -x /usr/bin/makewhatis ]; then

Subversion Repositories livecd

(root)/trunk/customize-livecd.sh – Rev 20 → 23