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

 # update f-prot and uvscan
 [ -x /usr/local/f-prot/tools/check-updates.pl ] && /usr/local/f-prot/tools/check-updates.pl
 [ -x /usr/local/uvscan/update-dat ] && /usr/local/uvscan/update-dat
 # run depmod -a for the LiveCD kernels
-echo "Run depmod -a $KERNEL ..."; depmod -a $KERNEL
+echo "Run depmod -a $KERNEL ..."
+depmod -a $KERNEL
 if [ $SMP ]; then
     echo "Run depmod -a ${KERNEL}smp ..."
     depmod -a ${KERNEL}smp
 fi
 userdel -r $LOCALUSER 2>/dev/null
 userdel -r l_psi 2>/dev/null
 userdel -r sluser 2>/dev/null
 userdel -r user 2>/dev/null
-# umount PSI master
-[ $PSI ] && umount /mnt/master 2>/dev/null
-# copy back /etc/yum.repos.d
+# copy back /etc/yum.repos.d.ori to /etc/yum.repos.d
-if [ ! $PSI ]; then
-    if [ -d /etc/yum.repos.d.ori ]; then
+if [ -d /etc/yum.repos.d.ori ]; then
-	cp -a /etc/yum.repos.d.ori /etc/yum.repos.d
+    cp -a /etc/yum.repos.d.ori /etc/yum.repos.d
-    fi
+fi
-fi
 # run cfagent
 if [ $PSI ]; then
     if [ -e /usr/bin/cfagent ]; then
         # cfagent needs running afs
 rm -f /var/cfengine/*log
 ### delete log files
 find /var/log/ -type f -exec rm -f {} \;
-### clean rpm database
+### clean rpm database cache
 rm -rf /var/lib/rpm/__db.*
 ### clean /var/spool/mail
 rm -rf /var/spool/mail/*
 touch /var/spool/mail/root
 chmod 600 /var/spool/mail/root
-### delete .cfsaved Files
-if [ $PSI ]; then
-    echo -n "Delete .cfsaved Files, please wait: "
-    find / -xdev -name "*\.cfsaved" -exec rm -f {} \;
-    echo "ok."
-fi
 ### delete .rpmori .rpm Files in /etc
 find /etc -name "*\.rpmorig" -exec rm -f {} \;
 find /etc -name "*\.rpmnew"  -exec rm -f {} \;
 find /etc -name "*\.rpmsave" -exec rm -f {} \;
 ### remove /.autofsck
 rm -f /.autofsck
 ### disable cfagent
-[ $PSI ] && rm -f /etc/cron.d/cfengine
+[ $PSI ] && mv /etc/cron.d/cfengine      /etc/cron_backup/ 2>/dev/null
+### disable psi-cronjobs
+[ $PSI ] && mv /etc/cron.d/psi-cronjobs  /etc/cron_backup/ 2>/dev/null
-### disable check_update in rc.local.psi
+### disable check_update
 [ $PSI ] && sed -i "s|/etc/init.d/check_update|# /etc/init.d/check_update|" /etc/rc.d/rc.local.psi
+[ $PSI ] && chkconfig check_update off
 ### 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}
 done
 ### remove useless cronjobs
 mkdir -p /etc/cron_backup
-mv /etc/cron.d/sysstat /etc/cron_backup/ 2>/dev/null
+mv /etc/cron.d/sysstat                 /etc/cron_backup/ 2>/dev/null
-mv /etc/cron.daily/00-makewhatis.cron /etc/cron_backup/ 2>/dev/null
 mv /etc/cron.weekly/00-makewhatis.cron /etc/cron_backup/00-makewhatis.cron.weekly 2>/dev/null
+mv /etc/cron.daily/00-makewhatis.cron  /etc/cron_backup/ 2>/dev/null
+mv /etc/cron.daily/makewhatis.cron     /etc/cron_backup/ 2>/dev/null
-mv /etc/cron.daily/rpm /etc/cron_backup/ 2>/dev/null
+mv /etc/cron.daily/rpm                 /etc/cron_backup/ 2>/dev/null
-mv /etc/cron.daily/slocate.cron /etc/cron_backup/ 2>/dev/null
+mv /etc/cron.daily/slocate.cron        /etc/cron_backup/ 2>/dev/null
-mv /etc/cron.daily/tetex.cron /etc/cron_backup/ 2>/dev/null
+mv /etc/cron.daily/tetex.cron          /etc/cron_backup/ 2>/dev/null
-mv /etc/cron.daily/yum.cron /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/prelink             /etc/cron_backup/ 2>/dev/null
-mv /etc/cron.daily/00-logwatch /etc/cron_backup/ 2>/dev/null
-### remove desktop entry from crossover
-[ $PSI ] && rm -f "/usr/share/apps/kdesktop/DesktopLinks/Internet Explorer.desktop"
 ### remove backup of /etc/X11/xorg.conf
-rm -f /etc/X11/xorg.conf.ori 2>/dev/null
+rm -f /etc/X11/xorg.conf.ori    2>/dev/null
 rm -f /etc/X11/xorg.conf.backup 2>/dev/null
 ### start afs with option -memcache !
 if [ -e /etc/sysconfig/afs ]; then
     if [ $PSI ]; then
 	sed -i "s|^EXTRA_OPTIONS=.*|EXTRA_OPTIONS='-fakestat -memcache'|" /etc/sysconfig/afs
+	sed -i "s|ENABLE_MEMCACHE='no'|ENABLE_MEMCACHE='yes'|" /etc/sysconfig/afs
     else
 	# for SL4
 	grep -q "\-fakestat \-memcache" /etc/sysconfig/afs
 	if [ "$?" != "0" ]; then
 	    sed -i "s|-fakestat|-fakestat -memcache|" /etc/sysconfig/afs
 	    sed -i "s|^OPTIONS=.*|OPTIONS=\"-memcache\"|" /etc/sysconfig/afs
 	fi
     fi
 fi
-### source /etc/sysconfig/cfengine
+### source /etc/sysconfig/psi
-[ $PSI ] && . /etc/sysconfig/cfengine
+[ $PSI ] && . /etc/sysconfig/psi
 ### Set /etc/motd
 LiveCD="LiveCD"
 [ "$ARCH" = "x86_64" ] && LiveCD="LiveCD 64bit"
 echo "Welcome to $LIVECD_OS ${LiveCD}" > /etc/motd
 ### 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
+    sed -i "s/HOSTNAME=.*/HOSTNAME=${HOSTNAME}/" /etc/sysconfig/psi
 else
     HOSTNAME="$DEFAULT_HOSTNAME"
 fi
-# change hostname
+### 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
 ### Modify /etc/redhat-release
 ADD=" - LiveCD"
 [ $MINI ] && ADD=" - LiveMiniCD"
 if [ -e /etc/redhat-release.ori ]; then
     echo "$( cat /etc/redhat-release.ori )${ADD}" > /etc/redhat-release
 fi
-### set default runlevel to $RUNLEVEL
+### Set default runlevel to $RUNLEVEL
 if [ $RUNLEVEL ]; then
     sed -i "s/id:.:initdefault:/id:$RUNLEVEL:initdefault:/" /etc/inittab
 fi
-### edit /etc/sysconfig/desktop
+### Edit /etc/sysconfig/desktop
 if [ $DESKTOP ]; then
     sed -i "/^DESKTOP=.*/d" /etc/sysconfig/desktop 2&>/dev/null
     echo "DESKTOP=$DESKTOP" >> /etc/sysconfig/desktop
 fi
 if [ $DISPLAYMANAGER ]; then
 if [ -e /usr/share/config/knotify.eventsrc ]; then
     cp -a customize/sl/knotify.eventsrc /usr/share/config/knotify.eventsrc
     cp -a customize/sl/kmixrc /usr/share/config/kmixrc
 fi
-### KDE session manager; start at login
-#   kmix, krandrtray
-# if [ -e /usr/share/config/ksmserverrc ]; then
-#    cp -a customize/sl/ksmserverrc /usr/share/config/ksmserverrc
-# fi
-#
-##  now done in runlast by coping .desktop files to .kde/Autostart
-#
 ### Configure SELinux
 if [ $SELINUX ]; then
     if [ -e /etc/selinux/config ]; then
 	sed -i "s|^SELINUX=.*|SELINUX=$SELINUX|" /etc/selinux/config
     fi
 ###############################################################
 # /etc/cron.d/psi
 ### PSI specific cronjobs
-if [ $PSI ]; then
+if [ $PSI ] && [ -e customize/psi/cron_psi.sl${OS_RELEASE} ]; then
-    cp -a customize/psi/cron_psi /etc/cron.d/psi
+    cp -a customize/psi/cron_psi.sl${OS_RELEASE} /etc/cron.d/psi
     chmod +x /etc/cron.d/psi
 fi
 echo "done."
 echo "--------------------------------------------"
 ###############################################################
 echo "Configure services ..."
 ### services off
 if [ $PSI ]; then
-    chkconfig cfenvd off 2>/dev/null
+    chkconfig cfenvd off  2>/dev/null
     chkconfig cfexecd off 2>/dev/null
     chkconfig cfservd off 2>/dev/null
 fi
 if [ ! "$SERVICES_OFF" = "" ]; then
     for service in $SERVICES_OFF; do
 	chkconfig $service off 2>/dev/null
     done
 fi
-# we do kudzu-auto
-chkconfig kudzu off
+### we do kudzu-auto
+chkconfig kudzu off
 ### services on
-if [ $PSI ]; then
-    chkconfig vpnclient_init on 2>/dev/null
-fi
 if [ ! "$SERVICES_ON" = "" ]; then
     for service in $SERVICES_ON; do
 	chkconfig $service on 2>/dev/null
     done
 fi
 echo "Empty files ..."
 ### /etc/security/users
 if [ $PSI ]; then
-    rm -f /etc/security/users
+    rm -f /etc/security/ssh.allow
-    touch /etc/security/users
+    touch /etc/security/ssh.allow
 fi
 ### Files to empty
 FILES_TOUCH="/etc/sysconfig/hwconf \
              /etc/resolv.conf \
 ### clean prelink log
 rm -f /var/log/prelink/prelink.log 2>/dev/null
 rm -f /var/log/prelink.log 2>/dev/null
 ### run makewhatis
+which makewhatis >/dev/null 2>&1
-if [ -x /usr/bin/makewhatis ]; then
+if [ "$?" = "0" ]; then
     echo "Run makewhatis..."
     makewhatis -u -w
 fi
 echo "done."

Subversion Repositories livecd

(root)/trunk/customize-livecd.sh @ 126 – Rev 117 → 125