Workaround the fact that Ubuntu packages want to install

their own init script in /etc/init.

This changes the chromeos-init package to install our
init scripts in /etc/init.chromeos. In the customize_rootfs
stage we remove /etc/init and replace with our init scripts.

Review URL: http://chromereview.prom.corp.google.com/1187069


git-svn-id: svn://chrome-svn/chromeos/trunk@264 06c00378-0e64-4dae-be16-12b19f9950a1
This commit is contained in:
tedbo@google.com 2009-11-17 18:14:36 +00:00
parent 72cfa11d9b
commit afab3ca65c

View File

@ -94,12 +94,6 @@ EOF
# Install prod packages # Install prod packages
apt-get update apt-get update
apt-get --yes --force-yes install $COMPONENTS apt-get --yes --force-yes install $COMPONENTS
if [ "$SUITE" = "jaunty" ]
then
# Additional driver modules needed for chromeos-wifi on jaunty.
apt-get --yes --force-yes --no-install-recommends \
install linux-backports-modules-jaunty
fi
# Create kernel installation configuration to suppress warnings, # Create kernel installation configuration to suppress warnings,
# install the kernel in /boot, and manage symlinks. # install the kernel in /boot, and manage symlinks.
@ -306,28 +300,12 @@ chmod 0666 "$UDEV_DEVICES"/null # Fix misconfiguration of /dev/null
# Since we may mount read-only, our mtab should symlink to /proc # Since we may mount read-only, our mtab should symlink to /proc
ln -sf /proc/mounts /etc/mtab ln -sf /proc/mounts /etc/mtab
# TODO(tedbo): We don't rely on any upstart provided jobs. When we build # For the most part, we use our own set of Upstart jobs that were installed
# our own upstart, stop it from installing jobs and then remove the lines # in /etc/init.chromeos so as not to mingle with jobs installed by various
# below that remove stuff from /etc/init # packages. We fix that up now.
cp /etc/init/tty2.conf /etc/init.chromeos
# We don't need last-good-boot if it exits rm -rf /etc/init
rm -f /etc/init/last-good-boot.conf mv /etc/init.chromeos /etc/init
# Don't create all of the virtual consoles
rm -f /etc/init/tty1.conf
rm -f /etc/init/tty[3-6].conf
sed -i '{ s:ACTIVE_CONSOLES=.*:ACTIVE_CONSOLES="/dev/tty2": }' \
/etc/default/console-setup
# We don't use the rc.conf that triggers scripts in /etc/rc?.d/
rm -f /etc/init/rc.conf
# We don't use the rcS or rc-sysinit upstart jobs either.
rm -f /etc/init/rcS.conf
rm -f /etc/init/rc-sysinit.conf
# We may want to tell init to connect to dbus in the future, but not now.
rm -f /etc/init/dbus-reconnect.conf
# By default, xkb writes computed configuration data to # By default, xkb writes computed configuration data to
# /var/lib/xkb. It can re-use this data to reduce startup # /var/lib/xkb. It can re-use this data to reduce startup