WebSVN – livecd – Diff – /trunk/SL6/livecd-config/sl6-live-base.ks

+########################################################################
+#
 # sl6-live-base.ks
+#
 # Defines the basics for all kickstarts of sl6-live
 # Kickstarts including this template can override these settings
+#
+########################################################################
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
 auth --useshadow --enablemd5
 xconfig --startxonboot
 services --enabled=NetworkManager --disabled=network,sshd
 ########################################################################
+#
 # Basic software packages
+#
 ########################################################################
 %packages
 syslinux
 kernel
 # basic software groups
 device-mapper-multipath
 isomd5sum
 %end
 ########################################################################
+#
-#  LiveCD post install
+#  LiveCD post install in chroot
+#
 ########################################################################
 %post
-########################################################################
+#***********************************************************************
-# LiveCD configuration file and LiveCD functions
+# Create LiveCD configuration file and LiveCD functions
-########################################################################
+#***********************************************************************
 cat > /etc/livesys.conf << 'EOF_livesysconf'
-###--------------------------------------------------------------------
+#--------------------------------------------------------------------
-### Configuration file for LiveCD
+# Configuration file for LiveCD
-###--------------------------------------------------------------------
+#--------------------------------------------------------------------
 # default LiveCD user
 LIVECD_DEF_USER="sluser"
 # delay in sec. before auto login
 EOF_livesysconf
 cat > /etc/init.d/livesys.functions << 'EOF_livesysfunctions'
-###--------------------------------------------------------------------
+#--------------------------------------------------------------------
-### livesys functions
+# livesys functions
-###--------------------------------------------------------------------
+#--------------------------------------------------------------------
 # egrep_o is a replacement for "egrep -o". It prints only the last matching text
 egrep_o() {
    cat | egrep "$1" | sed -r "s/.*($1).*/\\1/"
+}
+}
 EOF_livesysfunctions
-########################################################################
+#***********************************************************************
-# Create a sub-script so the output can be captured
+# Create /root/post-install
 # Must change "$" to "\$" and "`" to "\`" to avoid shell quoting
-########################################################################
+#***********************************************************************
 cat > /root/post-install << EOF_post
 #!/bin/bash
+#***********************************************************************
+# Create the livesys init script - /etc/rc.d/init.d/livesys
+#***********************************************************************
-echo ###################################################################
-echo ## Creating the livesys init script - livesys
+echo "Creating the livesys init script - livesys"
-echo ###################################################################
 cat > /etc/rc.d/init.d/livesys << EOF_initscript
 #!/bin/bash
+#
 # live: Init script for live image
 # set the LiveCD hostname
 [ ! "\\\$hostname" ] && hostname="livecd.localdomain"
 sed -i -e "s|HOSTNAME=.*|HOSTNAME=\\\$hostname|g" /etc/sysconfig/network
 /bin/hostname \\\$hostname
+#-----------------------------------------------------------------------
+# EXIT here if LiveCD has already been configured
+# happens if you start the LiveCD with persistent changes
+#-----------------------------------------------------------------------
-###########################################################
-# EXIT here if LiveCD has already been configured         #
-# happens if you start the LiveCD with persistent changes #
-###########################################################
 [ "\\\$configdone" ] && exit 0
 # turn off services, which are not useful on LiveCD, to preserve resources
 if [ "\\\$SERVICES_OFF" ]; then
     for service in \\\$SERVICES_OFF ; do
 ## create the LiveCD default user
 # add default user with no password
 /usr/sbin/useradd -c "LiveCD default user" \\\$LIVECD_USER
 /usr/bin/passwd -d \\\$LIVECD_USER > /dev/null
 # give default user sudo privileges
-echo "\\\$LIVECD_USER     ALL=(ALL)     NOPASSWD: ALL" >> /etc/sudoers
+# echo "\\\$LIVECD_USER     ALL=(ALL)     NOPASSWD: ALL" >> /etc/sudoers
 ## configure default user's desktop
 # set up timed auto-login at 10 seconds
 cat >> /etc/gdm/custom.conf << FOE
 [daemon]
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_check_hardware false >/dev/null
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_codec_helper false >/dev/null
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_font_helper false >/dev/null
 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
-# start system-config-firewall with sudo
+# start system-config-firewall with su
+# (bugfix: system-config-firewall does not work when root has no password)
-sed -i "s|^Exec=.*|Exec=sudo /usr/bin/system-config-firewall|" /usr/share/applications/system-config-firewall.desktop
+sed -i "s|^Exec=.*|Exec=su - -c /usr/bin/system-config-firewall|" /usr/share/applications/system-config-firewall.desktop
-sed -i "s|^Terminal=.*|Terminal=true|"                         /usr/share/applications/system-config-firewall.desktop
+sed -i "s|^Terminal=.*|Terminal=true|"                            /usr/share/applications/system-config-firewall.desktop
+#-----------------------------------------------------------------------
-### detecting disk partitions and logical volumes (disabled by default)
+# detecting disk partitions and logical volumes (disabled by default)
-### use boot parameter automount to enable it
+# use boot parameter automount to enable it
+#-----------------------------------------------------------------------
 CreateDesktopIconHD()
+{
 cat > /home/\\\$LIVECD_USER/Desktop/Local\ hard\ drives.desktop << EOF_HDicon
 [Desktop Entry]
 # give back ownership to the default user
 chown -R \\\$LIVECD_USER:\\\$LIVECD_USER /home/\\\$LIVECD_USER
 EOF_initscript
-echo ###################################################################
+#***********************************************************************
-echo ## End of livesys script
+# End of livesys script
-echo ###################################################################
+#***********************************************************************
+#***********************************************************************
+# Create the livesys init script - /etc/rc.d/init.d/livesys-late
+#***********************************************************************
-echo ###################################################################
-echo ## Creating the livesys init script - livesys-late
+echo "Creating the livesys init script - livesys-late"
-echo ###################################################################
 cat > /etc/rc.d/init.d/livesys-late << EOF_lateinitscript
 #!/bin/bash
+#
 # live: Late init script for live image
 if [ "\\\$kb" ]; then
     exists system-config-keyboard --noui \\\$kb
 fi
 EOF_lateinitscript
-echo ###################################################################
+#***********************************************************************
-echo ## End of livesys-late script
+# End of livesys-late script
-echo ###################################################################
+#***********************************************************************
+#***********************************************************************
+# Configure the LiveCD
+# Everthing configured here will survive LiveCD install to harddisk !
+#***********************************************************************
-echo ###################################################################
-echo ## Configure the LiveCD
+echo "Configure the LiveCD"
-echo ###################################################################
 # workaround avahi segfault (#279301)
 touch /etc/resolv.conf
 /sbin/restorecon /etc/resolv.conf
 # go ahead and pre-make the man -k cache (#455968)
 /usr/sbin/makewhatis -w
 # create locate db
-/etc/cron.daily/mlocate.cron 2>/dev/null
+/etc/cron.daily/mlocate.cron
 # run prelinking
-/etc/cron.daily/prelink 2>/dev/null
+/etc/cron.daily/prelink
 # save a little bit of space at least...
 rm -f /var/lib/rpm/__db*
 rm -f /boot/initrd*
 rm -f /boot/initramfs*
 # run post-install script
 /bin/bash -x /root/post-install 2>&1 | tee /root/post-install.log
 %end
 ########################################################################
+#
 # End of configure LiveCD in chroot
+#
 ########################################################################
-%post --nochroot
 ########################################################################
+#
-# Post install in no chroot
+#  LiveCD post no chroot install
-# Must change "$" to "\$" and "`" to "\`" to avoid shell quoting
+#
 ########################################################################
+%post --nochroot
+#***********************************************************************
+# Create /root/postnochroot-install
+# Must change "$" to "\$" and "`" to "\`" to avoid shell quoting
+#***********************************************************************
 cat > /root/postnochroot-install << EOF_postnochroot
 #!/bin/bash
 # Copy licensing information
 cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL
 # run postnochroot-install script
 /bin/bash -x /root/postnochroot-install 2>&1 | tee /root/postnochroot-install.log
 %end
 ########################################################################
+#
 # End of configure LiveCD in nochroot
+#
 ########################################################################

Subversion Repositories livecd

(root)/trunk/SL6/livecd-config/sl6-live-base.ks @ 281 – Rev 280 → 281