[Debian-live-changes] r1475 -
dists/trunk/live-initramfs/scripts/live-bottom
Daniel Baumann
daniel at alioth.debian.org
Fri May 11 20:47:13 UTC 2007
Author: daniel
Date: 2007-05-11 20:47:13 +0000 (Fri, 11 May 2007)
New Revision: 1475
Added:
dists/trunk/live-initramfs/scripts/live-bottom/011-integrity-check
dists/trunk/live-initramfs/scripts/live-bottom/021-live-conf
dists/trunk/live-initramfs/scripts/live-bottom/031-mount-root
dists/trunk/live-initramfs/scripts/live-bottom/111-kernel-modules
dists/trunk/live-initramfs/scripts/live-bottom/121-inittab
dists/trunk/live-initramfs/scripts/live-bottom/131-timezone
dists/trunk/live-initramfs/scripts/live-bottom/141-fstab
dists/trunk/live-initramfs/scripts/live-bottom/142-swap
dists/trunk/live-initramfs/scripts/live-bottom/151-hostname
dists/trunk/live-initramfs/scripts/live-bottom/152-networking
dists/trunk/live-initramfs/scripts/live-bottom/161-locales
dists/trunk/live-initramfs/scripts/live-bottom/162-keyboard
dists/trunk/live-initramfs/scripts/live-bottom/171-adduser
dists/trunk/live-initramfs/scripts/live-bottom/172-sudo
dists/trunk/live-initramfs/scripts/live-bottom/181-xvideomode
dists/trunk/live-initramfs/scripts/live-bottom/182-xorg
dists/trunk/live-initramfs/scripts/live-bottom/200-gnome-accessibility
dists/trunk/live-initramfs/scripts/live-bottom/200-gnome-apport-crashes
dists/trunk/live-initramfs/scripts/live-bottom/200-gnome-autologin
dists/trunk/live-initramfs/scripts/live-bottom/200-gnome-hibernation
dists/trunk/live-initramfs/scripts/live-bottom/200-gnome-language
dists/trunk/live-initramfs/scripts/live-bottom/200-gnome-panel
dists/trunk/live-initramfs/scripts/live-bottom/200-gnome-screensaver
dists/trunk/live-initramfs/scripts/live-bottom/200-kde-kwallet
dists/trunk/live-initramfs/scripts/live-bottom/200-update-notifier
dists/trunk/live-initramfs/scripts/live-bottom/300-apt-cdrom
dists/trunk/live-initramfs/scripts/live-bottom/300-driver-updates
dists/trunk/live-initramfs/scripts/live-bottom/300-preseed
Removed:
dists/trunk/live-initramfs/scripts/live-bottom/01-integrity-check
dists/trunk/live-initramfs/scripts/live-bottom/02-live-conf
dists/trunk/live-initramfs/scripts/live-bottom/02timezone
dists/trunk/live-initramfs/scripts/live-bottom/03-mount-root
dists/trunk/live-initramfs/scripts/live-bottom/10adduser
dists/trunk/live-initramfs/scripts/live-bottom/11sudo
dists/trunk/live-initramfs/scripts/live-bottom/12fstab
dists/trunk/live-initramfs/scripts/live-bottom/13swap
dists/trunk/live-initramfs/scripts/live-bottom/14locales
dists/trunk/live-initramfs/scripts/live-bottom/15autologin
dists/trunk/live-initramfs/scripts/live-bottom/18hostname
dists/trunk/live-initramfs/scripts/live-bottom/19keyboard
dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode
dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
dists/trunk/live-initramfs/scripts/live-bottom/22gnome_panel_data
dists/trunk/live-initramfs/scripts/live-bottom/22screensaver
dists/trunk/live-initramfs/scripts/live-bottom/23etc_modules
dists/trunk/live-initramfs/scripts/live-bottom/23networking
dists/trunk/live-initramfs/scripts/live-bottom/24preseed
dists/trunk/live-initramfs/scripts/live-bottom/25configure_init
dists/trunk/live-initramfs/scripts/live-bottom/30accessibility
dists/trunk/live-initramfs/scripts/live-bottom/31disable_update_notifier
dists/trunk/live-initramfs/scripts/live-bottom/32disable_hibernation
dists/trunk/live-initramfs/scripts/live-bottom/33enable_apport_crashes
dists/trunk/live-initramfs/scripts/live-bottom/34disable_kwallet
dists/trunk/live-initramfs/scripts/live-bottom/35fix_language_selector
dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates
dists/trunk/live-initramfs/scripts/live-bottom/41apt_cdrom
Log:
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/01-integrity-check
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/01-integrity-check 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/01-integrity-check 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# integrity-check script
-
-if [ -n "${INTEGRITY_CHECK}" ]
-then
- live-md5check /live_media /live_media/md5sum.txt < /dev/tty8
-fi
Copied: dists/trunk/live-initramfs/scripts/live-bottom/011-integrity-check (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/01-integrity-check)
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/02-live-conf
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/02-live-conf 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/02-live-conf 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# live-initramfs header
-
-. /scripts/live-functions
-
-log_begin_msg "Processing configuration file..."
-
-# live.conf script
-
-if [ -f /etc/live.conf ]
-then
- if [ -n "${LIVECONF}" ]
- then
- # Updating already existing live.conf with bootparameter values
- sed -i -e 's/\(USERNAME="\).*"/\1'"${USERNAME}"'"/g' \
- -e 's/\(USERFULLNAME="\).*"/\1'"${USERFULLNAME}"'"/g' \
- -e 's/\(HOSTNAME="\).*"/\1'"${HOSTNAME}"'"/g' \
- /etc/live.conf
- fi
-
- # Copying already existing live.conf
- cp -p /etc/live.conf /root/etc/live.conf
-else
-
-# Writing new live.conf with default values
-cat > /root/etc/live.conf << EOF
-export USERNAME="$USERNAME"
-export USERFULLNAME="$USERFULLNAME"
-export HOSTNAME="$HOSTNAME"
-EOF
-
-fi
-
-log_end_msg
Copied: dists/trunk/live-initramfs/scripts/live-bottom/021-live-conf (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/02-live-conf)
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/02timezone
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/02timezone 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/02timezone 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# live-initramfs header
-
-. /scripts/live-functions
-
-log_begin_msg "Setting timezone..."
-
-# timezone script
-
-cp -f /root/usr/share/zoneinfo/UTC /root/etc/localtime
-
-log_end_msg
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/03-mount-root
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/03-mount-root 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/03-mount-root 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# live-initramfs header
-
-. /scripts/live-functions
-
-log_begin_msg "Moving mount points..."
-
-# mount-root script
-
-# Move to the new root filesystem so that programs there can get at it
-if [ ! -d /root/live_media ]
-then
- mkdir -p /root/live_media
- mount -n -o move /live_media /root/live_media
-fi
-
-log_end_msg
Copied: dists/trunk/live-initramfs/scripts/live-bottom/031-mount-root (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/03-mount-root)
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/10adduser
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/10adduser 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/10adduser 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,84 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# live-initramfs header
-
-. /scripts/live-functions
-
-log_begin_msg "Adding live session user..."
-
-# adduser script
-
-# Setting password as in 'echo foo | mkpasswd -s'
-case "${BUILD_SYSTEM}" in
- Debian)
- # live
- PASSWORD="8Ab05sVQ4LLps"
- ;;
-
- Ubuntu)
- # ubuntu
- PASSWORD="U6aMy0wojraho"
- ;;
-
- *)
- # blank password
- PASSWORD="U6aMy0wojraho"
- ;;
-esac
-
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
-set passwd/root-password-crypted *
-set passwd/user-password-crypted ${PASSWORD}
-set passwd/user-fullname ${USERFULLNAME}
-set passwd/username ${USERNAME}
-set passwd/user-uid 999
-EOF
-
-chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
-
-# Clear out debconf database again to avoid confusing ubiquity later.
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
-set passwd/root-password-crypted
-set passwd/user-password-crypted
-set passwd/user-fullname
-set passwd/username
-set passwd/user-uid
-EOF
-
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
-then
- for FILE in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde/ubiquity-kdeui.desktop
- do
- if [ -f /root/${FILE} ]
- then
- chroot /root install -D -o ${USERNAME} -g ${USERNAME} ${FILE} /home/${USERNAME}/Desktop/`basename ${FILE}`
- break
- fi
- done
-
- if [ -L /root/home/${USERNAME}/Examples ]
- then
- chroot /root install -o ${USERNAME} -g ${USERNAME} -d /home/${USERNAME}/Desktop/
- mv /root/home/${USERNAME}/Examples /root/home/${USERNAME}/Desktop/
- fi
-fi
-
-log_end_msg
Copied: dists/trunk/live-initramfs/scripts/live-bottom/111-kernel-modules (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/23etc_modules)
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/11sudo
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/11sudo 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/11sudo 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# live-initramfs header
-
-. /scripts/live-functions
-
-log_begin_msg "Configuring sudo..."
-
-# sudo script
-
-if [ -f /root/etc/sudoers ]
-then
- case "${BUILD_SYSTEM}" in
- Debian)
- echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers
-
- chroot /root sudo -u "${USERNAME}" sh -c "echo 'SU_TO_ROOT_SU=sudo' >> /home/${USERNAME}/.su-to-rootrc"
-
- chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gksu/sudo-mode true
- chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gksu/display-no-pass-info false
-
-chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/config && cat > /home/${USERNAME}/.kde/share/config/kdesurc" << EOF
-[super-user-command]
-super-user-command=sudo
-EOF
-
- if [ -f /root/usr/share/apps/konsole/sumc.desktop ]
- then
- chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo mc -c/' /usr/share/apps/konsole/sumc.desktop > /home/${USERNAME}/.kde/share/apps/konsole/sumc.desktop"
- fi
-
- if [ -f /root/usr/share/apps/konsole/su.desktop ]
- then
- chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo -i/' /usr/share/apps/konsole/su.desktop > /home/${USERNAME}/.kde/share/apps/konsole/su.desktop"
- fi
- ;;
-
- Ubuntu)
- grep -q '^%admin' /root/etc/sudoers && sed -i -e '/^%admin/s/ALL$/NOPASSWD: ALL/' /root/etc/sudoers || echo '%admin ALL=(ALL) NOPASSWD: ALL' >> /root/etc/sudoers
- ;;
- esac
-fi
-
-log_end_msg
Copied: dists/trunk/live-initramfs/scripts/live-bottom/121-inittab (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/25configure_init)
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/12fstab
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/12fstab 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/12fstab 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# fstab
-
-FSTAB=/root/etc/fstab
-DESCRIPTION="Configuring fstab..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-cat > $FSTAB <<EOF
-unionfs / unionfs rw 0 0
-tmpfs /tmp tmpfs nosuid,nodev 0 0
-EOF
-
-rm -f /root/etc/rcS.d/S*checkroot.sh
-
-log_end_msg
Copied: dists/trunk/live-initramfs/scripts/live-bottom/131-timezone (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/02timezone)
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/13swap
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/13swap 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/13swap 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# live-initramfs header
-
-if [ -z "${SWAPOFF}" ]
-then
- exit 0
-fi
-
-FSTAB=/root/etc/fstab
-
-. /scripts/live-functions
-
-log_begin_msg "Setting up swap..."
-
-for DEVICE in /dev/[hs]d[a-z][0-9]*
-do
- if [ ! -b "${DEVICE}" ]
- then
- continue
- fi
-
- SWAP_MAGIC="`/bin/dd if=${DEVICE} bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null`" || continue
-
- if [ "${SWAP_MAGIC}" = "SWAPSPACE2" ] || [ "${SWAP_MAGIC}" = "SWAP-SPACE" ]
- then
- #log "Found $device"
- SWAP_DEVICES="${SWAP_DEVICE} ${DEVICE}"
- fi
-done
-
-for DEVICE in ${SWAP_DEVICES}
-do
-
-cat >> "${FSTAB}" << EOF
-${DEVICE} swap swap defaults 0 0
-EOF
-
-done
-
-log_end_msg
Copied: dists/trunk/live-initramfs/scripts/live-bottom/141-fstab (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/12fstab)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/142-swap (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/13swap)
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/14locales
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/14locales 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/14locales 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# locales
-
-DESCRIPTION="Setting up locales..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-if [ -e /root/etc/default/locale ]
-then
- grep_file=/root/etc/default/locale
-elif [ -e /root/etc/environment ] # Old locales policy
-then
- grep_file=/root/etc/environment
-fi
-
-if [ -n "${grep_file}" ]
-then
- # use rootfs configured locale
- locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' )
-else
- grep_file=/root/etc/default/locale
-fi
-
-# commandline
-if [ ! -z "${LOCALE}" ]
-then
- locale="${LOCALE}"
- set_locale="true"
-fi
-
-if [ -z "${locale}" ]
-then
- # Set a default one
- locale=en_US.UTF-8
- set_locale="true"
-fi
-
-if [ "${set_locale}" ]
-then
- if echo "${locale}" | grep -sqE '^[[:lower:]]{2}$'
- then
- # input is like "locale=it", so we will convert and setup also the keyboard if not already set
-
- if [ -z "${KBD}" ]
- then
- # FIXME: look if this keyb is supported
- KBD="${locale}"
- really_export KBD
- fi
-
- uploc=$(echo "${locale}" | tr '[a-z]' '[A-Z]')
- locale="${locale}_${uploc}.UTF-8"
- fi
-
- LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 |sed -e 's, .*,,' -e q)
-
- if [ -z "${LANG}" ]
- then
- log_warning_message "Locale ${locale} is unsupported."
- locale="en_US.UTF-8"
- LANG="${locale}"
- fi
-
- really_export LANG
-
- if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
- then
- printf 'LANG="%s"\n' "${LANG}" > "${grep_file}"
- chroot /root /usr/sbin/locale-gen "${LANG}"
- live-preseed /root debian-installer/locale "${locale}"
- else
- printf 'LANG=%s\n' "${LANG}" > "${grep_file}"
- printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
- chroot /root /usr/sbin/locale-gen
- fi
-fi
-
-log_end_msg
Copied: dists/trunk/live-initramfs/scripts/live-bottom/151-hostname (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/18hostname)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/152-networking (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/23networking)
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/15autologin
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/15autologin 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/15autologin 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# autologin
-
-DESCRIPTION="Setting up automatic login..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-if chroot /root [ -f /etc/gdm/gdm-cdd.conf ]
-then
- GDMCONF=/etc/gdm/gdm-cdd.conf
-else
- GDMCONF=/etc/gdm/gdm.conf
-fi
-
-if chroot /root [ -f ${GDMCONF} ]
-then
- if [ "${BUILD_SYSTEM}" = "Debian" ]
- then
- # true hack ! -- nohar
- chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
- fi
-
- # Configure GDM autologin
- chroot /root sed -i \
- -e "s/^AutomaticLoginEnable=.*\$/AutomaticLoginEnable=true/" \
- -e "s/^AutomaticLogin=.*\$/AutomaticLogin=$USERNAME/" \
- -e "s/^TimedLoginEnable=.*\$/TimedLoginEnable=true/" \
- -e "s/^TimedLogin=.*\$/TimedLogin=$USERNAME/" \
- -e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
- ${GDMCONF}
-fi
-
-if [ -f /root/etc/kde3/kdm/kdmrc ]
-then
- # Configure KDM autologin
- sed -i -r \
- -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
- -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \
- -e "s/^#?AutoReLogin=.*\$/AutoReLogin=true/" \
- /root/etc/kde3/kdm/kdmrc
-fi
-
-if chroot /root /usr/bin/which kpersonalizer >/dev/null
-then
- # Disable first-login wizard for KDE
- if [ ! -f /root/etc/kde3/kpersonalizerrc ]
- then
-
-cat > /root/etc/kde3/kpersonalizerrc <<EOF
-[General]
-FirstLogin=false
-EOF
-
- else
- echo "I'm not smart enough to disable kpersonalizer startup" >&2
- echo "Because kpersonalizerrc already exists" >&2
- fi
-fi
-
-log_end_msg
Copied: dists/trunk/live-initramfs/scripts/live-bottom/161-locales (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/14locales)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/162-keyboard (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/19keyboard)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/171-adduser (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/10adduser)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/172-sudo (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/11sudo)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/181-xvideomode (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/182-xorg (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/20xconfig)
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/18hostname
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/18hostname 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/18hostname 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# hostname
-
-DESCRIPTION="Setting hostname..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-echo "$HOSTNAME" > /root/etc/hostname
-
-cat > /root/etc/hosts << EOF
-127.0.0.1 localhost
-127.0.1.1 $HOSTNAME
-
-# The following lines are desirable for IPv6 capable hosts
-::1 ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-EOF
-
-log_end_msg
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/19keyboard
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/19keyboard 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/19keyboard 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,72 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-DESCRIPTION="Setting up console keyboard..."
-
-. /scripts/live-functions
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-log_begin_msg "$DESCRIPTION"
-
-kbd=
-cslayout=
-csvariant=
-csmodel=
-
-# commandline
-if [ -n "${KBD}" ]; then
- kbd="${KBD}"
-else
- kbd=us
-fi
-
-really_export kbd
-
-if [ -n "${KLAYOUT}" ]; then
- cslayout="${KLAYOUT}"
-fi
-if [ -n "${KVARIANT}" ]; then
- csvariant="${KVARIANT}"
-fi
-if [ -n "${KMODEL}" ]; then
- csmodel="${KMODEL}"
-fi
-
-if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
- if [ "$cslayout" ]; then
- chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"$cslayout\"/" \
- /etc/default/console-setup
- if [ "$csvariant" ]; then
- chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"$csvariant\"/" \
- /etc/default/console-setup
- else
- live-preseed /root console-setup/variantcode '' false
- fi
- if [ "$csmodel" ]; then
- chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"$csmodel\"/" \
- /etc/default/console-setup
- else
- live-preseed /root console-setup/modelcode '' false
- fi
- else
- live-preseed /root console-setup/layoutcode '' false
- live-preseed /root console-setup/variantcode '' false
- live-preseed /root console-setup/modelcode '' false
- fi
-else
- chroot /root /usr/sbin/install-keymap $kbd
- live-preseed /root kbd-chooser/method "$kbd"
-fi
-log_end_msg
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-DESCRIPTION="Configuring X kludges..."
-
-. /scripts/live-functions
-
-if [ -n "$XVIDEOMODE" ]
-then
- log_begin_msg "$DESCRIPTION"
-
- mount -n -o bind /sys /root/sys
- mount -n -o bind /proc /root/proc
- mount -n -o bind /dev /root/dev
-
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
-set xserver-xorg/config/monitor/mode-list ${XVIDEOMODE}
-set xserver-xorg/config/display/modes ${XVIDEOMODE}
-EOF
-
- chroot /root dexconf
-
- umount /root/sys
- umount /root/proc
- umount /root/dev
-
- log_end_msg
-fi
Copied: dists/trunk/live-initramfs/scripts/live-bottom/200-gnome-accessibility (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/30accessibility)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/200-gnome-apport-crashes (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/33enable_apport_crashes)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/200-gnome-autologin (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/15autologin)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/200-gnome-hibernation (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/32disable_hibernation)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/200-gnome-language (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/35fix_language_selector)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/200-gnome-panel (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/22gnome_panel_data)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/200-gnome-screensaver (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/22screensaver)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/200-kde-kwallet (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/34disable_kwallet)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/200-update-notifier (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/31disable_update_notifier)
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/20xconfig 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/20xconfig 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# xorg
-
-if [ "$TERM_TYPE" = "serial" ]
-then
- # Don't bother trying to configure or start X on a serial console
- rm -f /etc/rc?.d/S??[gxk]dm
- exit 0
-fi
-
-DESCRIPTION="Configuring X..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-mount -n -o bind /sys /root/sys
-mount -n -o bind /proc /root/proc
-mount -n -o bind /dev /root/dev
-
-if [ -n "${XDEBCONF}" ] && [ -x /root/usr/sbin/xdebconfigurator ]
-then
- # xdebconfigurator
- chroot /root /usr/sbin/xdebconfigurator
-fi
-
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
-then
-
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
-set xserver-xorg/autodetect_keyboard true
-fset xserver-xorg/autodetect_keyboard seen true
-EOF
-
-else
- # d-i code not present, so:
- if [ -n "${KOPTIONS}" ]
- then
- setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}"
- fi
-
- if [ -n "${KVARIANT}" ]
- then
- setvariant="set xserver-xorg/config/inputdevice/keyboard/variant ${KVARIANT}"
- fi
-
- if [ -n "${KMODEL}" ]
- then
- setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
- fi
-
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
-set xserver-xorg/config/inputdevice/keyboard/layout ${kbd}
-${setvariant}
-${setmodel}
-${setoptions}
-EOF
-
-fi
-
-DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg
-umount /root/sys
-umount /root/proc
-umount /root/dev
-
-log_end_msg
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/22gnome_panel_data
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/22gnome_panel_data 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/22gnome_panel_data 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# gnome-panel-data
-
-DESCRIPTION="Configuring gnome-panel-data..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-if [ -x /root/usr/sbin/laptop-detect ]
-then
- if chroot /root laptop-detect
- then
- live-reconfigure /root gnome-panel-data
- fi
-fi
-
-panel_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-panel-data 2>/dev/null) || panel_version=""
-
-if [ -n "$panel_version" ]
-then
- chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true
-fi
-
-log_end_msg
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/22screensaver
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/22screensaver 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/22screensaver 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# screensaver
-
-DESCRIPTION="Configuring screensaver..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
-then
- # XXX - awful hack to stop xscreensaver locking the screen (#7150)
- echo 'RUNNING_UNDER_GDM="yes"' >> /root/etc/environment
-fi
-
-gnome_screensaver_version=$(chroot /root dpkg-query -W --showformat='${Version}' gnome-screensaver 2>/dev/null) || gnome_screensaver_version=""
-
-if [ -n "$gnome_screensaver_version" ]
-then
- # Support legacy gconf value
- chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock false
- chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock_enabled false
-fi
-
-log_end_msg
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/23etc_modules
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/23etc_modules 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/23etc_modules 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# etc-modules
-
-DESCRIPTION="Preconfiguring /etc/modules..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-case "$DPKG_ARCH" in
- powerpc|ppc64)
- # load the right modules
- echo snd_powermac >> /root/etc/modules
- ;;
-esac
-
-log_end_msg
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/23networking
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/23networking 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/23networking 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,131 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# networking
-
-DESCRIPTION="Preconfiguring networking..."
-IFFILE="/root/etc/network/interfaces"
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-if [ "${STATICIP}" = "frommedia" ] && [ -e "$IFFILE" ]
-then
- # will use existent /etc/network/interfaces
- log_end_msg
- exit 0
-fi
-
-cat > "$IFFILE" << EOF
-auto lo
-iface lo inet loopback
-
-EOF
-
-udevtrigger
-udevsettle
-
-if [ -z "${NETBOOT}" ] && [ -n "${STATICIP}" ] && [ "${STATICIP}" != "frommedia" ]
-then
- parsed=$(echo "${STATICIP}" | sed -e 's/:/ /g')
-
- for ifline in ${parsed}
- do
- ifname="$(echo ${ifline} | cut -f1 -d ',')"
- ifaddress="$(echo ${ifline} | cut -f2 -d ',')"
- ifnetmask="$(echo ${ifline} | cut -f3 -d ',')"
- ifgateway="$(echo ${ifline} | cut -f4 -d ',')"
-
-cat >> "$IFFILE" <<EOF
-auto ${ifname}
-iface ${ifname} inet static
- address ${ifaddress}
- netmask ${ifnetmask}
- gateway ${ifgateway}
-
-EOF
-
- done
-else
- if [ -z "${NETBOOT}" ]
- then
- # default, dhcp assigned
- method="dhcp"
- else
- # make sure that the preconfigured interface would not get reassigned by dhcp
- # on startup by ifup script - otherwise our root fs might be disconnected!
- method="manual"
- fi
-
- # iterate the physical interfaces and add them to the interfaces list
- for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
- do
- [ -e $interface ] || continue
- i="$(basename $interface)"
-
-cat >> "$IFFILE" <<EOF
-auto $i
-iface $i inet $method
-
-EOF
-
- done
-
- if [ ! -f /root/etc/resolv.conf ] && [ -f /netboot.config ]
- then
- # create a resolv.conf if it is not present
- cp /netboot.config /root/var/log/netboot.config
-
- rc_search=$(cat netboot.config | awk '/domain/{print $3}')
- rc_server0=$(cat netboot.config | awk '/dns0/{print $5}')
- rc_server1=$(cat netboot.config | awk '/dns0/{print $8}')
- rc_server0="nameserver ${rc_server0}"
-
- if [ "${rc_server1}" = "0.0.0.0" ]
- then
- rc_server1=""
- else
- rc_server1="nameserver ${rc_server1}"
- fi
-
-cat > /root/etc/resolv.conf <<EOF
-# /etc/resolv.conf
-# Autogenerated by casper
-search ${rc_search}
-domain ${rc_search}
-${rc_server0}
-${rc_server1}
-EOF
-
- cat /root/etc/resolv.conf >> /root/var/log/netboot.config
- fi
-fi
-
-#for i in eth0 eth1 eth2 ath0 wlan0; do
-# grep -q "iface $i" $IFFILE && continue
-# cat >> "$IFFILE" <<EOF
-#auto $i
-#iface $i inet dhcp
-#
-#EOF
-#done
-
-log_end_msg
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/24preseed
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/24preseed 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/24preseed 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# preseed
-
-DESCRIPTION="Loading preseed file..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-if [ -f "/root/${LOCATION}" ]
-then
- chroot /root debconf-set-selections < "/root/${LOCATION}"
-fi
-
-if [ -n "${PRESEEDS}" ]
-then
- for preseed in ${PRESEEDS}
- do
- question="${preseed%%=*}"
- value="${preseed#*=}"
-
- live-preseed /root "${question}" "${value}"
- done
-fi
-
-log_end_msg
-
-exit 0
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/25configure_init
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/25configure_init 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/25configure_init 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# configure-init
-
-DESCRIPTION="Setting up init..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-# Arrange for shells on virtual consoles, rather than login prompts
-
-if [ -n "$USERNAME" ]
-then
- if [ -n "${LIVE_GETTY}" ]
- then
- if echo "${DEFCONSOLE}" | grep -qs ttyS
- then
- # AUTOMATIC SERIAL CONSOLE #
- PORT=$(echo "${DEFCONSOLE}" | sed -e 's%,.*%%')
- SPEED=$(echo "${DEFCONSOLE}" | sed -e 's%ttyS[0-9]\+,%%' -e's%\([0-9]\+\).*%\1%')
-
- if ! ( sed -n -e'/^[^#]/p' /root/etc/inittab | grep -qs ":respawn:/sbin/getty.*${PORT}" )
- then
- IDs="A B C D E F G H I J K L M N O P Q R S T Q U V V X Y Z 0 1 2 3 4 5 6 7 8 9"
-
- for ID1 in $IDs
- do
- for ID2 in $IDs
- do
- ID="${ID1}${ID2}"
-
- if ! grep "^${ID}:" /etc/inittab
- then
- #make sure it is not already in use
- break 2
- fi
- done
- done
-
- echo "${ID}:2345:respawn:/sbin/live-getty -L ${PORT} ${SPEED} vt100" \
- >> /root/etc/inittab
- fi
- fi
-
- if [ -f /root/etc/inittab ]
- then
- sed -i -e'/^[^#]/s%respawn:/sbin/getty%respawn:/sbin/live-getty%' /root/etc/inittab
- fi
- else
- if [ -f /root/etc/inittab ]
- then
- sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9]*\).*$|\1:/bin/login -f $USERNAME </dev/\2 >/dev/\2 2>\&1|" /root/etc/inittab
- fi
-
- if [ "/root/etc/event.d/tty*" != "$(echo /root/etc/event.d/tty*)" ]
- then
- for f in /root/etc/event.d/tty*
- do
- sed -i -e "s|^respawn.*|respawn /bin/login -f $USERNAME </dev/$(basename $f) > /dev/$(basename $f) 2>\&1|" $f
- done
- fi
- fi
-fi
-
-# This has the nice side effect of the cron.{daily,weekly,monthly} jobs in
-# /etc/crontab remaining disabled, yet also not run by anacron
-if [ -x /root/etc/init.d/anacron ]
-then
- for f in /root/etc/rc?.d/S??anacron
- do
- mv ${f} ${f%/*}/K00anacron
- done
-fi
-
-# No point, really
-rm -f /root/etc/rc?.d/[SK]??postfix
-
-# Avoid clobbering the user's clock
-rm -f /root/etc/rc?.d/K??hwclock.sh
-
-# Disable readahead since it doesn't play well with squashfs + unionfs
-# use chmod instead of mv to not trigger unionfs bugs.
-if [ -e /root/sbin/readahead-list ]
-then
- chmod -x /root/sbin/readahead-list
-fi
-
-log_end_msg
-
-exit 0
Copied: dists/trunk/live-initramfs/scripts/live-bottom/300-apt-cdrom (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/41apt_cdrom)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/300-driver-updates (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates)
Copied: dists/trunk/live-initramfs/scripts/live-bottom/300-preseed (from rev 1474, dists/trunk/live-initramfs/scripts/live-bottom/24preseed)
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/30accessibility
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/30accessibility 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/30accessibility 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,114 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# accessibility
-
-DESCRIPTION="Configuring accessibility options..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-gconf_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gconf2 2>/dev/null) || gconf_version=""
-
-gct ()
-{
- if [ "$gconf_version" ]
- then
- chroot /root sudo -u "$USERNAME" gconftool-2 "$@"
- fi
-}
-
-kderc_addtoprefixes ()
-{
- if [ -e "/root/etc/kderc" ]
- then
- sed -i "s|\\(prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/\\)|\\1,$1|" /root/etc/kderc
- fi
-}
-
-case $ACCESS in
- # Lesser Visual Impairment
- access=v1)
- gct -s -t string /desktop/gnome/interface/gtk_theme HighContrastLargePrint
- gct -s -t string /desktop/gnome/interface/icon_theme HighContrast
- gct -s -t string /desktop/gnome/interface/monospace_font_name "monospace 18"
- gct -s -t string /desktop/gnome/interface/font_name "sans 18"
- gct -s -t string /apps/metacity/general/theme Atlanta
- gct -s -t string /desktop/gnome/background/picture_filename ""
- gct -s -t string /desktop/gnome/background/picture_options none
- gct -s -t string /desktop/gnome/background/primary_color \#666666
- gct -s -t string /desktop/gnome/background/secondary_color \#7F7F7F
- gct -s -t string /desktop/gnome/background/color_shading_type solid
- gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
- gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
-
- kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
- if [ -d /root/usr/share/xubuntu-default-settings/accessibility ]; then
- cp -a /root/usr/share/xubuntu-default-settings/accessibility/* /root/etc/xdg/
- fi
- ;;
- # Moderate Visual Impairment
- access=v2)
- gct -s -t bool /desktop/gnome/interface/accessibility true
- gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
- if [ -e /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py ]; then
- sed -i '/^enableSpeech\W/ s/True/False/;/^enableMagnifier/ s/False/True/' /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py
- fi
- kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
- ;;
- # Blindness
- access=v3)
- gct -s -t bool /desktop/gnome/sound/enable_esd false
- gct -s -t bool /desktop/gnome/interface/accessibility true
- gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
- ;;
- # Minor Motor Difficulties
- access=m1)
- gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
- gct -s -t bool /desktop/gnome/accessibility/keyboard/mousekeys_enable true
- gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
- gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep true
- gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
- gct -s -t bool /desktop/gnome/peripherals/keyboard/repeat true
- gct -s -t int /desktop/gnome/peripherals/keyboard/delay 700
- gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
-
- kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
- if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
- sed -i 's/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
- fi
- ;;
- # Motor Difficulties - pointing devices
- access=m2)
- gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
- gct -s -t bool /desktop/gnome/interface/accessibility true
- gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
- gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep false
- gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
- gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [onboard]
-
- kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
- if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
- sed -i '/Sticky/ s/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
- fi
- ;;
-esac
-log_end_msg
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/31disable_update_notifier
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/31disable_update_notifier 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/31disable_update_notifier 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# disable_update_notifier
-
-DESCRIPTION="Disabling update-notifier..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-# For GNOME, we divert away apt-check to avoid a regular 'apt-get update'
-# equivalent in the live session. We want to run update-notifier for crash
-# report handling.
-chroot /root dpkg-divert --add --rename --quiet \
- /usr/lib/update-notifier/apt-check
-ln -s /bin/true /root/usr/lib/update-notifier/apt-check
-
-# For KDE, adept_notifier's only useful function at the moment is an
-# 'apt-get update' equivalent, so we disable it entirely.
-rm -f /root/usr/share/autostart/adept_notifier_auto.desktop
-
-log_end_msg
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/32disable_hibernation
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/32disable_hibernation 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/32disable_hibernation 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# disable hibernation
-
-DESCRIPTION="Configuring power management..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-
-gpm_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-power-manager 2>/dev/null) || panel_version=""
-if [ -n "$gpm_version" ]; then
-# live-reconfigure /root gnome-power-manager
- chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/gnome-power-manager/can_hibernate false
- chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/gnome-power-manager/can_suspend false
-fi
-
-if [ -d /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config ]; then
- echo "disableSuspend=1" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/power-managerrc
- echo "disableHibernate=1" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/power-managerrc
-fi
-
-log_end_msg
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/33enable_apport_crashes
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/33enable_apport_crashes 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/33enable_apport_crashes 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-DESCRIPTION="Enabling notifications about program crashes..."
-
-. /scripts/live-functions
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-log_begin_msg "$DESCRIPTION"
-
-update_notifier_version=$(chroot /root dpkg-query -W --showformat='${Version}' update-notifier 2>/dev/null) || update_notifier_version=""
-if [ -n "$update_notifier_version" ]; then
- chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/update-notifier/show_apport_crashes true
-fi
-
-log_end_msg
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/34disable_kwallet
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/34disable_kwallet 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/34disable_kwallet 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# disable kwallet
-
-DESCRIPTION="Disabling kwallet..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-rm -f /root/usr/share/services/kded/kwalletd.desktop
-
-log_end_msg
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/35fix_language_selector
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/35fix_language_selector 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/35fix_language_selector 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# fx language selector
-
-DESCRIPTION="Fixing language selector..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
-if [ -e /root/usr/share/applications/language-selector.desktop ]
-then
- sed -i '/^Exec/ s|/usr/bin/gnome-language-selector|"& -n"|' /root/usr/share/applications/language-selector.desktop
-fi
-
-if [ -x /root/usr/bin/fontconfig-voodoo ]
-then
- chroot /root fontconfig-voodoo --auto --quiet || true
-fi
-
-log_end_msg
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# install driver updates
-
-DESCRIPTION="Installing driver updates..."
-
-. /scripts/live-functions
-
-if [ ! -d /tmp/driver-updates ]; then
- exit 0
-fi
-
-log_begin_msg "$DESCRIPTION"
-
-install_dir=/var/cache/driver-updates
-
-mkdir "/root$install_dir"
-cp -a /tmp/driver-updates/*.deb "/root$install_dir/"
-
-# We cannot leave packages in a bad state. So if the install fails, remove
-# it. This will get caught in casper.log.
-for deb in "/root$install_dir"/*; do
- if ! chroot /root dpkg -i "$install_dir/$deb"; then
- chroot /root dpkg -P "${deb%%_*}"
- fi
-done
-
-log_end_msg
Deleted: dists/trunk/live-initramfs/scripts/live-bottom/41apt_cdrom
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/41apt_cdrom 2007-05-11 20:27:02 UTC (rev 1474)
+++ dists/trunk/live-initramfs/scripts/live-bottom/41apt_cdrom 2007-05-11 20:47:13 UTC (rev 1475)
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# apt-cdrom
-
-DESCRIPTION="Adding APT-CDROM source..."
-
-. /scripts/live-functions
-
-mkdir -p /root/cdrom
-mount -n -o bind /cdrom /root/cdrom
-chroot /root apt-cdrom -m add
-umount /root/cdrom
More information about the Debian-live-changes
mailing list