| Line 59... |
Line 59... |
| 59 |
squashfs-tools
|
59 |
squashfs-tools
|
| 60 |
@core
|
60 |
@core
|
| 61 |
@graphical-admin-tools
|
61 |
@graphical-admin-tools
|
| 62 |
@network-file-system-client
|
62 |
@network-file-system-client
|
| 63 |
@network-tools
|
63 |
@network-tools
|
| 64 |
@remote-desktop-clients
|
- |
|
| 65 |
# packages added to @remote-desktop-clients
|
- |
|
| 66 |
rdesktop
|
- |
|
| 67 |
tsclient
|
- |
|
| 68 |
@x11
|
64 |
@x11
|
| 69 |
@ice-desktop
|
65 |
@ice-desktop
|
| 70 |
|
66 |
|
| - |
|
67 |
# remote-desktop-clients
|
| - |
|
68 |
rdesktop
|
| - |
|
69 |
tsclient
|
| - |
|
70 |
|
| 71 |
# other usefull packages
|
71 |
# other usefull packages
|
| 72 |
busybox
|
72 |
busybox
|
| 73 |
mailx
|
73 |
mailx
|
| 74 |
memtest86+
|
74 |
memtest86+
|
| 75 |
livecd-tools
|
75 |
livecd-tools
|
| Line 400... |
Line 400... |
| 400 |
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_check_hardware false >/dev/null
|
400 |
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_check_hardware false >/dev/null
|
| 401 |
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_codec_helper false >/dev/null
|
401 |
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_codec_helper false >/dev/null
|
| 402 |
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_font_helper false >/dev/null
|
402 |
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_font_helper false >/dev/null
|
| 403 |
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_mime_type_helper false >/dev/null
|
403 |
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_mime_type_helper false >/dev/null
|
| 404 |
|
404 |
|
| 405 |
### don't enable the gnome-settings-daemon packagekit plugin
|
- |
|
| 406 |
gsettings set org.gnome.settings-daemon.plugins.updates active 'false'
|
- |
|
| 407 |
|
- |
|
| 408 |
### start system-config-firewall with su
|
405 |
### start system-config-firewall with su
|
| 409 |
# (bugfix: system-config-firewall does not work when root has no password)
|
406 |
# (bugfix: system-config-firewall does not work when root has no password)
|
| 410 |
sed -i "s|^Exec=.*|Exec=su - -c /usr/bin/system-config-firewall|" /usr/share/applications/system-config-firewall.desktop
|
407 |
sed -i "s|^Exec=.*|Exec=su - -c /usr/bin/system-config-firewall|" /usr/share/applications/system-config-firewall.desktop
|
| 411 |
sed -i "s|^Terminal=.*|Terminal=true|" /usr/share/applications/system-config-firewall.desktop
|
408 |
sed -i "s|^Terminal=.*|Terminal=true|" /usr/share/applications/system-config-firewall.desktop
|
| 412 |
|
409 |
|
| Line 690... |
Line 687... |
| 690 |
#!/bin/bash
|
687 |
#!/bin/bash
|
| 691 |
|
688 |
|
| 692 |
# Copy licensing information
|
689 |
# Copy licensing information
|
| 693 |
cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL
|
690 |
cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL
|
| 694 |
|
691 |
|
| - |
|
692 |
cp -a \$LIVE_ROOT/isolinux/isolinux.cfg \$LIVE_ROOT/isolinux/isolinux.cfg.ori
|
| - |
|
693 |
|
| 695 |
# customize boot menu entries
|
694 |
# customize boot menu entries
|
| 696 |
grep -B4 'menu default' \$LIVE_ROOT/isolinux/isolinux.cfg > \$LIVE_ROOT/isolinux/default.txt
|
695 |
grep -B4 'menu default' \$LIVE_ROOT/isolinux/isolinux.cfg > \$LIVE_ROOT/isolinux/default.txt
|
| 697 |
grep -B3 'xdriver=vesa nomodeset' \$LIVE_ROOT/isolinux/isolinux.cfg > \$LIVE_ROOT/isolinux/basicvideo.txt
|
696 |
grep -B3 'xdriver=vesa nomodeset' \$LIVE_ROOT/isolinux/isolinux.cfg > \$LIVE_ROOT/isolinux/basicvideo.txt
|
| 698 |
grep -A3 'label check0' \$LIVE_ROOT/isolinux/isolinux.cfg > \$LIVE_ROOT/isolinux/check.txt
|
697 |
grep -A3 'label check0' \$LIVE_ROOT/isolinux/isolinux.cfg > \$LIVE_ROOT/isolinux/check.txt
|
| 699 |
grep -A2 'label memtest' \$LIVE_ROOT/isolinux/isolinux.cfg > \$LIVE_ROOT/isolinux/memtest.txt
|
698 |
grep -A2 'label memtest' \$LIVE_ROOT/isolinux/isolinux.cfg > \$LIVE_ROOT/isolinux/memtest.txt
|
| Line 717... |
Line 716... |
| 717 |
sed -i "s/ quiet / /" \$LIVE_ROOT/isolinux/textinstall.txt
|
716 |
sed -i "s/ quiet / /" \$LIVE_ROOT/isolinux/textinstall.txt
|
| 718 |
sed -i "s/ rhgb / /" \$LIVE_ROOT/isolinux/textinstall.txt
|
717 |
sed -i "s/ rhgb / /" \$LIVE_ROOT/isolinux/textinstall.txt
|
| 719 |
sed -i "/menu default/d" \$LIVE_ROOT/isolinux/textinstall.txt
|
718 |
sed -i "/menu default/d" \$LIVE_ROOT/isolinux/textinstall.txt
|
| 720 |
|
719 |
|
| 721 |
cat \$LIVE_ROOT/isolinux/default.txt \$LIVE_ROOT/isolinux/basicvideo.txt \$LIVE_ROOT/isolinux/check.txt \$LIVE_ROOT/isolinux/memtest.txt \$LIVE_ROOT/isolinux/localboot.txt > \$LIVE_ROOT/isolinux/current.txt
|
720 |
cat \$LIVE_ROOT/isolinux/default.txt \$LIVE_ROOT/isolinux/basicvideo.txt \$LIVE_ROOT/isolinux/check.txt \$LIVE_ROOT/isolinux/memtest.txt \$LIVE_ROOT/isolinux/localboot.txt > \$LIVE_ROOT/isolinux/current.txt
|
| - |
|
721 |
|
| 722 |
diff \$LIVE_ROOT/isolinux/isolinux.cfg \$LIVE_ROOT/isolinux/current.txt | sed '/^[0-9][0-9]*/d; s/^. //; /^---$/d' > \$LIVE_ROOT/isolinux/cleaned.txt
|
722 |
diff \$LIVE_ROOT/isolinux/isolinux.cfg \$LIVE_ROOT/isolinux/current.txt | sed '/^[0-9][0-9]*/d; s/^. //; /^---$/d' > \$LIVE_ROOT/isolinux/cleaned.txt
|
| 723 |
cat \$LIVE_ROOT/isolinux/cleaned.txt \$LIVE_ROOT/isolinux/default.txt \$LIVE_ROOT/isolinux/textboot.txt \$LIVE_ROOT/isolinux/basicvideo.txt \$LIVE_ROOT/isolinux/install.txt \$LIVE_ROOT/isolinux/textinstall.txt \$LIVE_ROOT/isolinux/memtest.txt \$LIVE_ROOT/isolinux/localboot.txt > \$LIVE_ROOT/isolinux/isolinux.cfg
|
- |
|
| 724 |
rm -f \$LIVE_ROOT/isolinux/*.txt
|
- |
|
| 725 |
|
723 |
|
| 726 |
# SL6 comes with dracut = 004. Replace new dracut >= 008 options
|
724 |
cat \$LIVE_ROOT/isolinux/cleaned.txt \
|
| 727 |
sed -i "s|rd.live.check|check|" \$LIVE_ROOT/isolinux/isolinux.cfg
|
725 |
\$LIVE_ROOT/isolinux/default.txt \
|
| 728 |
sed -i "s|rd.live.check|check|" \$LIVE_ROOT/EFI/boot/boot.conf
|
726 |
\$LIVE_ROOT/isolinux/textboot.txt \
|
| 729 |
sed -i "s|rd.live.check|check|" \$LIVE_ROOT/EFI/boot/bootia32.conf
|
727 |
\$LIVE_ROOT/isolinux/basicvideo.txt \
|
| 730 |
sed -i "s|rd.live.check|check|" \$LIVE_ROOT/EFI/boot/grub.conf
|
- |
|
| 731 |
sed -i "s|rd.live.check|check|" \$LIVE_ROOT/EFI/boot/isolinux.cfg
|
728 |
\$LIVE_ROOT/isolinux/check.txt \
|
| 732 |
|
- |
|
| 733 |
sed -i "s|rd.luks=0|rd_NO_LUKS|" \$LIVE_ROOT/isolinux/isolinux.cfg
|
729 |
\$LIVE_ROOT/isolinux/install.txt \
|
| 734 |
sed -i "s|rd.md=0|rd_NO_MD|" \$LIVE_ROOT/isolinux/isolinux.cfg
|
730 |
\$LIVE_ROOT/isolinux/textinstall.txt \
|
| 735 |
sed -i "s|rd.dm=0|rd_NO_DM|" \$LIVE_ROOT/isolinux/isolinux.cfg
|
731 |
\$LIVE_ROOT/isolinux/memtest.txt \
|
| 736 |
|
- |
|
| 737 |
sed -i "s|rd.luks=0|rd_NO_LUKS|" \$LIVE_ROOT/EFI/boot/isolinux.cfg
|
732 |
\$LIVE_ROOT/isolinux/localboot.txt > \$LIVE_ROOT/isolinux/isolinux.cfg
|
| 738 |
sed -i "s|rd.md=0|rd_NO_MD|" \$LIVE_ROOT/EFI/boot/isolinux.cfg
|
- |
|
| 739 |
sed -i "s|rd.dm=0|rd_NO_DM|" \$LIVE_ROOT/EFI/boot/isolinux.cfg
|
733 |
# rm -f \$LIVE_ROOT/isolinux/*.txt
|
| 740 |
|
734 |
|
| 741 |
EOF_postnochroot
|
735 |
EOF_postnochroot
|
| 742 |
|
736 |
|
| 743 |
# run postnochroot-install script
|
737 |
# run postnochroot-install script
|
| 744 |
/bin/bash -x /root/postnochroot-install 2>&1 | tee /root/postnochroot-install.log
|
738 |
/bin/bash -x /root/postnochroot-install 2>&1 | tee /root/postnochroot-install.log
|