| Line 627... |
Line 627... |
| 627 |
|
627 |
|
| 628 |
|
628 |
|
| 629 |
### restore cronjobs
|
629 |
### restore cronjobs
|
| 630 |
### -----------------------------------------------------------
|
630 |
### -----------------------------------------------------------
|
| 631 |
mv $NEW/etc/cron_backup/sysstat $NEW/etc/cron.d/ 2>/dev/null
|
631 |
mv $NEW/etc/cron_backup/sysstat $NEW/etc/cron.d/ 2>/dev/null
|
| - |
|
632 |
mv $NEW/etc/cron_backup/cfengine $NEW/etc/cron.d/ 2>/dev/null
|
| - |
|
633 |
mv $NEW/etc/cron_backup/psi-cronjobs $NEW/etc/cron.d/ 2>/dev/null
|
| 632 |
mv $NEW/etc/cron_backup/00-makewhatis.cron.weekly $NEW/etc/cron.weekly/00-makewhatis.cron 2>/dev/null
|
634 |
mv $NEW/etc/cron_backup/00-makewhatis.cron.weekly $NEW/etc/cron.weekly/00-makewhatis.cron 2>/dev/null
|
| 633 |
mv $NEW/etc/cron_backup/* $NEW/etc/cron.daily/ 2>/dev/null
|
635 |
mv $NEW/etc/cron_backup/* $NEW/etc/cron.daily/ 2>/dev/null
|
| 634 |
|
636 |
|
| 635 |
|
637 |
|
| 636 |
### prepare chroot to $NEW
|
638 |
### prepare chroot to $NEW
|
| Line 643... |
Line 645... |
| 643 |
### turn on kudzu again
|
645 |
### turn on kudzu again
|
| 644 |
### -----------------------------------------------------------
|
646 |
### -----------------------------------------------------------
|
| 645 |
chroot $NEW chkconfig kudzu on
|
647 |
chroot $NEW chkconfig kudzu on
|
| 646 |
|
648 |
|
| 647 |
|
649 |
|
| - |
|
650 |
### turn on check_update again (only at PSI)
|
| - |
|
651 |
### -----------------------------------------------------------
|
| - |
|
652 |
chroot $NEW chkconfig check_update on 2>/dev/null
|
| - |
|
653 |
|
| - |
|
654 |
|
| 648 |
### remove some files
|
655 |
### remove some files
|
| 649 |
### -----------------------------------------------------------
|
656 |
### -----------------------------------------------------------
|
| 650 |
rm -rf $NEW/usr/share/applications/livecd-install-gui.desktop
|
657 |
rm -rf $NEW/usr/share/applications/livecd-install-gui.desktop
|
| 651 |
rm -rf $NEW/usr/share/applications/save-localdata.desktop
|
658 |
rm -rf $NEW/usr/share/applications/save-localdata.desktop
|
| 652 |
|
659 |
|
| Line 677... |
Line 684... |
| 677 |
|
684 |
|
| 678 |
|
685 |
|
| 679 |
### disable nvidia driver
|
686 |
### disable nvidia driver
|
| 680 |
### -----------------------------------------------------------
|
687 |
### -----------------------------------------------------------
|
| 681 |
# not in case of a PSI installation
|
688 |
# not in case of a PSI installation
|
| 682 |
if [ ! -e /etc/sysconfig/cfengine ]; then
|
689 |
if [ ! -e /etc/sysconfig/psi ]; then
|
| 683 |
if [ -e $NEW/etc/X11/xorg.conf.nv_SAVED ]; then
|
690 |
if [ -e $NEW/etc/X11/xorg.conf.nv_SAVED ]; then
|
| 684 |
echo "Remove nvidia driver and correct xorg.conf ..."
|
691 |
echo "Remove nvidia driver and correct xorg.conf ..."
|
| 685 |
# correct xorg.conf
|
692 |
# correct xorg.conf
|
| 686 |
sed -i "s/#nv_SAVED //" $NEW/etc/X11/xorg.conf
|
693 |
sed -i "s/#nv_SAVED //" $NEW/etc/X11/xorg.conf
|
| 687 |
sed -i "/.*Driver.*nvidia.*/d" $NEW/etc/X11/xorg.conf
|
694 |
sed -i "/.*Driver.*nvidia.*/d" $NEW/etc/X11/xorg.conf
|