#!/bin/bash
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.39 2006/02/21 19:50:22 wolf31o2 Exp $
-. /tmp/chroot-functions.sh
+RUN_DEFAULT_FUNCS="no"
-update_env_settings
+source /tmp/chroot-functions.sh
-# Allow root logins to the livecd by default
+# Allow root logins to our CD by default
if [ -e /etc/sshd/sshd_config ]
then
sed -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \
# Turn off udev tarball
sed -i 's:RC_DEVICE_TARBALL="yes":RC_DEVICE_TARBALL="no":' /etc/conf.d/rc
+# Turn off udev coldplugging
+sed -i 's:RC_COLDPLUG="yes":RC_COLDPLUG="no":' /etc/conf.d/rc
+
# Clean up the time and set to UTC
rm -rf /etc/localtime
cp /usr/share/zoneinfo/UTC /etc/localtime
# Add any users
if [ -n "${clst_livecd_users}" ]
then
+ first_user=$(echo ${clst_livecd_users} | cut -d' ' -f1)
+
+ # Here we check to see if games exists for bug #125498
+ if [ "$(getent group games | cut -d: -f1)" != "games" ]
+ then
+ echo "Adding games group"
+ groupadd -g 35 games
+ fi
+ if [ "$(getent group plugdev | cut -d: -f1)" != "plugdev" ]
+ then
+ echo "Adding plugdev group"
+ groupadd plugdev
+ fi
for x in ${clst_livecd_users}
do
- useradd -G users,wheel,audio,games,cdrom,usb -c "Default LiveCD User" \
- -m $x
+ useradd -G users,wheel,audio,plugdev,games,cdrom,disk,floppy,usb \
+ -c "Default LiveCD User" -m ${x}
+ chown -R ${x}:users /home/${x}
if [ -n "${clst_livecd_xdm}" -a -n "${clst_livecd_xsession}" ]
then
- echo "[Desktop]" > /home/$x/.dmrc
- echo "Session=${clst_livecd_xsession}" >> /home/$x/.dmrc
- chown -R $x:users /home/$x
+ echo "[Desktop]" > /home/${x}/.dmrc
+ echo "Session=${clst_livecd_xsession}" >> /home/${x}/.dmrc
+ chown -R ${x}:users /home/${x}
fi
done
fi
sed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
fi
-# We want the first user to be used when auto-starting X
-if [ -n "${clst_livecd_users}" -a -e /etc/startx ]
-then
- first_user=$(echo ${clst_livecd_users} | cut -d' ' -f1)
- sed -i "s/##STARTX/su - $first_user -c startx/" /root/.bashrc
-fi
-
-# Setup DHCP on all detected ethernet devices
-echo "iface_eth0=\"dhcp\""> /etc/conf.d/net
-echo "iface_eth1=\"dhcp\"" >> /etc/conf.d/net
-echo "iface_eth2=\"dhcp\"" >> /etc/conf.d/net
-echo "iface_eth3=\"dhcp\"" >> /etc/conf.d/net
-echo "iface_eth4=\"dhcp\"" >> /etc/conf.d/net
-
# Setup links for ethernet devices
cd /etc/init.d
ln -sf net.lo net.eth1
# Add this for hwsetup/mkx86config
mkdir -p /etc/sysconfig
+# Tweak the livecd fstab so that users know not to edit it
+# http://bugs.gentoo.org/show_bug.cgi?id=60887
+echo "####################################################" > /etc/fstab
+echo "## ATTENTION: THIS IS THE FSTAB ON THE LIVECD ##" >> /etc/fstab
+echo "## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab ##" >> /etc/fstab
+echo "####################################################" >> /etc/fstab
+
# fstab tweaks
-echo "tmpfs / tmpfs defaults 0 0" > /etc/fstab
+echo "tmpfs / tmpfs defaults 0 0" >> /etc/fstab
echo "tmpfs /lib/firmware tmpfs defaults 0 0" >> /etc/fstab
echo "tmpfs /usr/portage tmpfs defaults 0 0" >> /etc/fstab
# If /usr/lib/X11/xkb/compiled then make it tmpfs
/etc/fstab
fi
+# Tweak the livecd make.conf so that users know not to edit it
+# http://bugs.gentoo.org/show_bug.cgi?id=144647
+mv /etc/make.conf /etc/make.conf.old
+echo "####################################################" >> /etc/make.conf
+echo "## ATTENTION: THIS IS THE MAKE.CONF ON THE LIVECD ##" >> /etc/make.conf
+echo "## PLEASE EDIT /mnt/gentoo/etc/make.conf INSTEAD ##" >> /etc/make.conf
+echo "####################################################" >> /etc/make.conf
+cat /etc/make.conf.old >> /etc/make.conf
+
# devfs tweaks
[ -e /etc/devfsd.conf ] && sed -i '/dev-state/ s:^:#:' /etc/devfsd.conf
-# Tweak the livecd fstab so that users know not to edit it
-# http://bugs.gentoo.org/show_bug.cgi?id=60887
-mv /etc/fstab /etc/fstab.old
-echo "####################################################" >> /etc/fstab
-echo "## ATTENTION: THIS IS THE FSTAB ON THE LIVECD ##" >> /etc/fstab
-echo "## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab ##" >> /etc/fstab
-echo "####################################################" >> /etc/fstab
-cat /etc/fstab.old >> /etc/fstab
-rm /etc/fstab.old
-
# Add some helpful aliases
echo "alias cp='cp -i'" >> /etc/profile
echo "alias mv='mv -i'" >> /etc/profile
echo "alias ll='ls -l'" >> /etc/profile
echo "alias grep='grep --color=auto'" >> /etc/profile
-# Make sure we have the latest pci,usb and hotplug ids
+# Make sure we have the latest pci,usb and hotplug ids. Older versions of
+# pciutils and usbutils used /sbin, where newer versions use /usr/sbin.
[ -x /sbin/update-pciids ] && /sbin/update-pciids
[ -x /sbin/update-usbids ] && /sbin/update-usbids
+[ -x /usr/sbin/update-pciids ] && /usr/sbin/update-pciids
+[ -x /usr/sbin/update-usbids ] && /usr/sbin/update-usbids
if [ -d /usr/share/hwdata ]
then
- [ -f /usr/share/hwdata/pci.ids ] && rm -f /usr/share/hwdata/pci.ids
- [ -f /usr/share/hwdata/usb.ids ] && rm -f /usr/share/hwdata/usb.ids
- ln -s /usr/share/misc/pci.ids /usr/share/hwdata/pci.ids
- ln -s /usr/share/misc/usb.ids /usr/share/hwdata/usb.ids
+ # If we have uncompressed pci and usb ids files, symlink them.
+ [ -f /usr/share/misc/pci.ids ] && [ -f /usr/share/hwdata/pci.ids ] && \
+ rm -f /usr/share/hwdata/pci.ids && ln -s /usr/share/misc/pci.ids \
+ /usr/share/hwdata/pci.ids
+ [ -f /usr/share/misc/usb.ids ] && [ -f /usr/share/hwdata/usb.ids ] && \
+ rm -f /usr/share/hwdata/usb.ids && ln -s /usr/share/misc/usb.ids \
+ /usr/share/hwdata/usb.ids
+ # If we have compressed pci and usb files, we download our own copies.
+ [ -f /usr/share/misc/pci.ids.gz ] && [ -f /usr/share/hwdata/pci.ids ] && \
+ rm -f /usr/share/hwdata/pci.ids && wget -O /usr/share/hwdata/pci.ids \
+ http://pciids.sourceforge.net/v2.2/pci.ids
+ [ -f /usr/share/misc/usb.ids.gz ] && [ -f /usr/share/hwdata/usb.ids ] && \
+ rm -f /usr/share/hwdata/usb.ids && wget -O /usr/share/hwdata/usb.ids \
+ http://www.linux-usb.org/usb.ids
fi
# Setup opengl in /etc (if configured)
# Setup configured display manager
if [ -n "${clst_livecd_xdm}" ]
then
- sed -i "s:#DISPLAYMANAGER=\"xdm\":DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
+ sed -i \
+ -e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
/etc/rc.conf
- rc-update add xdm default
+ sed -i \
+ -e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
+ /etc/conf.d/xdm
fi
# Setup configured default X Session
then
if [ -d /etc/splash/${clst_livecd_splash_theme} ]
then
- sed -i 's:# SPLASH_THEME="gentoo":SPLASH_THEME=\"${clst_livecd_splash_theme}\":' /etc/conf.d/splash
+ sed -i \
+ -e "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" \
+ -e "/^# SPLASH_TTYS=/ s/^#//" \
+ /etc/conf.d/splash
rm -f /etc/splash/default
ln -s /etc/splash/${clst_livecd_splash_theme} /etc/splash/default
else
if [ -n "$(ls /lib/firmware)" ]
then
cd /lib/firmware
- if [ -n "$(ls /usr/lib/hotplug/firmware)" ]
- then
- cp /usr/lib/hotplug/firmware/* /lib/firmware
- fi
/bin/tar cjpf /lib/firmware.tar.bz2 .
- rm -f /lib/firmware/*
- mkdir -p /usr/lib/hotplug
- rm -rf /usr/lib/hotplug/firmware
- ln -sf /lib/firmware /usr/lib/hotplug/firmware
+ rm -rf /lib/firmware/*
fi
# Clear out locales
touch /etc/startx
;;
gentoo-release-livecd )
- # First we setup the livecd-kernel package
- if [ -e /opt/installer/misc/mkvardb ]
- then
- chmod +x /opt/installer/misc/mkvardb
- /opt/installer/misc/mkvardb -p livecd-kernel -c sys-kernel -v ${clst_version_stamp} --provide "virtual/alsa" /boot/kernel* /boot/initr* $(for i in $(find "/lib/modules/" -type f); do grep --quiet "${i}" /var/db/pkg/*/*/CONTENTS || echo ${i}; done)
- fi
-
- if [ "${clst_livecd_xsession}" == "gnome" ]
+ # Setup Gnome theme
+# if [ "${clst_livecd_xsession}" == "gnome" ]
+# then
+# gconftool-2 --direct \
+# --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+# --type string --set /desktop/gnome/interface/theme Clearlooks
+# gconftool-2 --direct \
+# --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+# --type string --set /apps/metacity/general/theme Clearlooks
+# gconftool-2 --direct \
+# --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+# --type string --set /desktop/gnome/interface/gtk_key_theme \
+# Clearlooks
+# gconftool-2 --direct \
+# --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+# --type string --set /desktop/gnome/interface/gtk_theme \
+# Clearlooks
+# gconftool-2 --direct \
+# --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+# --type string --set /desktop/gnome/interface/font_name "Sans 9"
+# fi
+
+ # Setup GDM
+ if [ "${clst_livecd_xdm}" == "gdm" ]
then
- gconftool-2 --direct \
- --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type string --set /desktop/gnome/interface/icon_theme Crux
- gconftool-2 --direct \
- --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type string --set /desktop/gnome/interface/theme Crux
- gconftool-2 --direct \
- --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type string --set /apps/metacity/general/theme Crux
- gconftool-2 --direct \
- --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type string --set /desktop/gnome/interface/gtk_key_theme \
- Clearlooks
- gconftool-2 --direct \
- --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type string --set /desktop/gnome/interface/gtk_theme \
- Clearlooks
- gconftool-2 --direct \
- --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type string --set /desktop/gnome/interface/font_name "Sans 9"
+ if [ ! -e /etc/X11/gdm/gdm.conf ] && [ -e /usr/share/gdm/defaults.conf ]
+ then
+ if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ]
+ then
+ sedxtra="\nTimedLogin=${first_user}"
+ else
+ sedxtra=""
+ fi
+
+ cp -f /etc/X11/gdm/custom.conf /etc/X11/gdm/custom.conf.old
+
+ sed -i \
+ -e "s:\(\[daemon\]\)$:\1\nTimedLoginEnable=true\nTimedLoginDelay=10${sedxtra}:" \
+ -e 's:\(\[greeter\]\)$:\1\nGraphicalTheme=gentoo-emergence:' \
+ /etc/X11/gdm/custom.conf
+ else
+ cp -f /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm.conf.old
+ sed -i \
+ -e 's:TimedLoginEnable=false:TimedLoginEnable=true:' \
+ -e 's:TimedLoginDelay=30:TimedLoginDelay=10:' \
+ -e 's:AllowRemoteRoot=true:AllowRemoteRoot=false:' \
+ -e ':^#GraphicalTheme=: s:^#::' \
+ -e 's:^GraphicalTheme=.*$:GraphicalTheme=gentoo-emergence:' \
+ /etc/X11/gdm/gdm.conf
+
+ if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ]
+ then
+ sed -i \
+ -e "s:TimedLogin=:TimedLogin=${first_user}:" \
+ /etc/X11/gdm/gdm.conf
+ fi
+ fi
fi
# This gives us our list of system packages for the installer
mkdir -p /usr/livecd
- USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -ep system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' > /usr/livecd/systempkgs.txt
+ USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt
# This is my hack to reduce tmpfs usage
cp -r /usr/portage/profiles /usr/livecd
cp -r /usr/portage/eclass /usr/livecd
rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*}
mv -f /etc/gconf /usr/livecd
+ ln -sf /usr/livecd/gconf /etc/gconf
mv -f /var/db /usr/livecd
+ ln -sf /usr/livecd/db /var/db
- # This gives us a proper cache for portage
+ # This gives us a proper cache for portage/installer
tar cjf /usr/livecd/metadata.tar.bz2 /var/cache/edb/dep/usr/portage
+
+ # Clear out lastlog
+ rm -f /var/log/lastlog && touch /var/log/lastlog
+
+ # Create our Handbook icon
+ create_handbook_icon
+
+ # Copy our icons into place and build home directories
+ if [ -n "${clst_livecd_users}" ]
+ then
+ for username in ${clst_livecd_users}
+ do
+ mkdir -p /home/${username}/Desktop
+ # Copy our Handbook icon
+ cp -f /usr/share/applications/gentoo-handbook.desktop \
+ /home/${username}/Desktop
+ # Copy our installer icons
+ if [ -e /usr/share/applications/installer-gtk.desktop ]
+ then
+ cp -f /usr/share/applications/installer-gtk.desktop \
+ /home/${username}/Desktop
+ cp -f /usr/share/applications/installer-dialog.desktop \
+ /home/${username}/Desktop
+ sed -i -e \
+ 's:Exec=installer-dialog:Exec=sudo installer-dialog:' \
+ /home/${username}/Desktop/installer-dialog.desktop
+ sed -i -e 's:Exec=installer-gtk:Exec=installer:' \
+ /home/${username}/Desktop/installer-gtk.desktop
+ fi
+ chown -R ${username}:100 /home/${username}
+ done
+ fi
;;
generic-livecd )
# This is my hack to reduce tmpfs usage
mkdir -p /usr/livecd
- mv -f /etc/gconf /usr/livecd
+
+ if [ -d /etc/gconf ]
+ then
+ mv -f /etc/gconf /usr/livecd
+ ln -sf /usr/livecd/gconf /etc/gconf
+ fi
+
+ if [ -e /usr/livecd/kernelpkgs.txt ]
+ then
+ rm -f /usr/livecd/kernelpkgs.txt
+ fi
touch /etc/startx
;;
* )
- if [ -e /usr/livecd/grppkgs.txt ]
- then
- rm -f /usr/livecd/grppkgs.txt
- fi
if [ -e /usr/livecd/kernelpkgs.txt ]
then
rm -f /usr/livecd/kernelpkgs.txt
;;
esac
-if [-e /lib/rcscripts/addons/udev-start.sh ]
+# We want the first user to be used when auto-starting X
+if [ -e /etc/startx ]
+then
+ sed -i \
+ "s:##STARTX:source /etc/profile && su - ${first_user} -c startx:" \
+ /root/.bashrc
+fi
+
+if [ -e /lib/rcscripts/addons/udev-start.sh ]
then
sed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh
fi