diff options
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/live (renamed from scripts/casper) | 52 | ||||
-rwxr-xr-x | scripts/live-bottom/01integrity_check (renamed from scripts/casper-bottom/01integrity_check) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/02_timezone (renamed from scripts/casper-bottom/02_timezone) | 4 | ||||
-rwxr-xr-x | scripts/live-bottom/05mountpoints (renamed from scripts/casper-bottom/05mountpoints) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/10adduser (renamed from scripts/casper-bottom/10adduser) | 6 | ||||
-rwxr-xr-x | scripts/live-bottom/12fstab (renamed from scripts/casper-bottom/12fstab) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/13swap (renamed from scripts/casper-bottom/13swap) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/14locales (renamed from scripts/casper-bottom/14locales) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/15autologin (renamed from scripts/casper-bottom/15autologin) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/18hostname (renamed from scripts/casper-bottom/18hostname) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/19keyboard (renamed from scripts/casper-bottom/19keyboard) | 14 | ||||
-rwxr-xr-x | scripts/live-bottom/20xconfig (renamed from scripts/casper-bottom/20xconfig) | 6 | ||||
-rwxr-xr-x | scripts/live-bottom/22gnome_panel_data (renamed from scripts/casper-bottom/22gnome_panel_data) | 4 | ||||
-rwxr-xr-x | scripts/live-bottom/22screensaver (renamed from scripts/casper-bottom/22screensaver) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/23etc_modules (renamed from scripts/casper-bottom/23etc_modules) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/23networking (renamed from scripts/casper-bottom/23networking) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/24preseed (renamed from scripts/casper-bottom/24preseed) | 6 | ||||
-rwxr-xr-x | scripts/live-bottom/25configure_init (renamed from scripts/casper-bottom/25configure_init) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/30accessibility (renamed from scripts/casper-bottom/30accessibility) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/31disable_update_notifier (renamed from scripts/casper-bottom/31disable_update_notifier) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/32disable_hibernation (renamed from scripts/casper-bottom/32disable_hibernation) | 4 | ||||
-rwxr-xr-x | scripts/live-bottom/33enable_apport_crashes (renamed from scripts/casper-bottom/33enable_apport_crashes) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/34disable_kwallet (renamed from scripts/casper-bottom/34disable_kwallet) | 4 | ||||
-rwxr-xr-x | scripts/live-bottom/35fix_language_selector (renamed from scripts/casper-bottom/35fix_language_selector) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/40install_driver_updates (renamed from scripts/casper-bottom/40install_driver_updates) | 2 | ||||
-rwxr-xr-x | scripts/live-bottom/41apt_cdrom (renamed from scripts/casper-bottom/41apt_cdrom) | 2 | ||||
-rw-r--r-- | scripts/live-functions (renamed from scripts/casper-functions) | 0 | ||||
-rw-r--r-- | scripts/live-helpers (renamed from scripts/casper-helpers) | 0 | ||||
-rwxr-xr-x | scripts/live-premount/10driver_updates (renamed from scripts/casper-premount/10driver_updates) | 4 |
29 files changed, 69 insertions, 69 deletions
diff --git a/scripts/casper b/scripts/live index a4c78b3..9ab1ac5 100755 --- a/scripts/casper +++ b/scripts/live @@ -9,28 +9,28 @@ echo "/root/usr/lib" >> /etc/ld.so.conf mountpoint=/cdrom -USERNAME=casper +USERNAME=user USERFULLNAME="Live session user" HOST=live BUILD_SYSTEM=Custom mkdir -p $mountpoint -[ -f /etc/casper.conf ] && . /etc/casper.conf +[ -f /etc/live.conf ] && . /etc/live.conf export USERNAME USERFULLNAME HOST BUILD_SYSTEM -. /scripts/casper-helpers +. /scripts/live-helpers -if [ ! -f /casper.vars ]; then - touch /casper.vars +if [ ! -f /live.vars ]; then + touch /live.vars fi is_casper_path() { path=$1 - if [ -d "$path/casper" ]; then - if [ "$(echo $path/casper/*.squashfs)" != "$path/casper/*.squashfs" ] || - [ "$(echo $path/casper/*.ext2)" != "$path/casper/*.ext2" ] || - [ "$(echo $path/casper/*.dir)" != "$path/casper/*.dir" ]; then + if [ -d "$path/live" ]; then + if [ "$(echo $path/live/*.squashfs)" != "$path/live/*.squashfs" ] || + [ "$(echo $path/live/*.ext2)" != "$path/live/*.ext2" ] || + [ "$(echo $path/live/*.dir)" != "$path/live/*.dir" ]; then return 0 fi fi @@ -46,7 +46,7 @@ get_backing_device() { echo "directory" ;; *) - panic "Unrecognized casper filesystem: $1" + panic "Unrecognized live filesystem: $1" ;; esac } @@ -64,10 +64,10 @@ match_files_in_dir() { mount_images_in_directory() { directory="$1" rootmnt="$2" - if match_files_in_dir "$directory/casper/*.squashfs" || - match_files_in_dir "$directory/casper/*.ext2" || - match_files_in_dir "$directory/casper/*.dir"; then - setup_unionfs "$directory/casper" "$rootmnt" + if match_files_in_dir "$directory/live/*.squashfs" || + match_files_in_dir "$directory/live/*.ext2" || + match_files_in_dir "$directory/live/*.dir"; then + setup_unionfs "$directory/live" "$rootmnt" else : fi @@ -294,7 +294,7 @@ try_snap () return 1 fi fi - echo "export ${snap_type}SNAP="${snap_mount}":${snapdev}:${snapfile}" >> /etc/casper.conf # for resync on reboot/halt + echo "export ${snap_type}SNAP="${snap_mount}":${snapdev}:${snapfile}" >> /etc/live.conf # for resync on reboot/halt return 0 } @@ -378,15 +378,15 @@ setup_unionfs() { if [ -n "${SHOWMOUNTS}" ]; then for d in ${rofslist}; do - mkdir -p "${rootmnt}/casper/${d##*/}" + mkdir -p "${rootmnt}/live/${d##*/}" case d in - *.dir) # do nothing # mount -o bind "${d}" "${rootmnt}/casper/${d##*/}" + *.dir) # do nothing # mount -o bind "${d}" "${rootmnt}/live/${d##*/}" ;; - *) mount -o move "${d}" "${rootmnt}/casper/${d##*/}" + *) mount -o move "${d}" "${rootmnt}/live/${d##*/}" ;; esac done - # shows cow fs on /cow for use by casper-snapshot + # shows cow fs on /cow for use by live-snapshot mkdir -p "${rootmnt}/cow" mount -o bind /cow "${rootmnt}/cow" fi @@ -486,13 +486,13 @@ set_usplash_timeout() { mountroot() { exec 6>&1 exec 7>&2 - exec > casper.log + exec > live.log exec 2>&1 set_usplash_timeout - [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-premount" + [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/live-premount" pulsate - run_scripts /scripts/casper-premount + run_scripts /scripts/live-premount [ "$quiet" != "y" ] && log_end_msg # Needed here too because some things (*cough* udev *cough*) @@ -536,14 +536,14 @@ mountroot() { log_end_msg - maybe_break casper-bottom - [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-bottom" + maybe_break live-bottom + [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/live-bottom" pulsate - run_scripts /scripts/casper-bottom + run_scripts /scripts/live-bottom [ "$quiet" != "y" ] && log_end_msg exec 1>&6 6>&- exec 2>&7 7>&- - cp casper.log "${rootmnt}/var/log/" + cp live.log "${rootmnt}/var/log/" } diff --git a/scripts/casper-bottom/01integrity_check b/scripts/live-bottom/01integrity_check index 637a1ff..d5bc5fe 100755 --- a/scripts/casper-bottom/01integrity_check +++ b/scripts/live-bottom/01integrity_check @@ -15,4 +15,4 @@ prereqs) ;; esac -grep integrity-check /proc/cmdline && casper-md5check /cdrom /cdrom/md5sum.txt < /dev/tty8 +grep integrity-check /proc/cmdline && live-md5check /cdrom /cdrom/md5sum.txt < /dev/tty8 diff --git a/scripts/casper-bottom/02_timezone b/scripts/live-bottom/02_timezone index 1cb6402..873c1da 100755 --- a/scripts/casper-bottom/02_timezone +++ b/scripts/live-bottom/02_timezone @@ -1,9 +1,9 @@ #! /bin/sh PREREQ="" -DESCRIPTION="Adding APT-CDROM source..." +DESCRIPTION="Setting timezone..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/05mountpoints b/scripts/live-bottom/05mountpoints index 7c61de3..411660d 100755 --- a/scripts/casper-bottom/05mountpoints +++ b/scripts/live-bottom/05mountpoints @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Moving mount points..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/10adduser b/scripts/live-bottom/10adduser index 4fe9378..9179f1b 100755 --- a/scripts/casper-bottom/10adduser +++ b/scripts/live-bottom/10adduser @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Adding live session user..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { @@ -21,7 +21,7 @@ esac log_begin_msg "$DESCRIPTION" # U6aMy0wojraho is just a blank password -chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF +chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF set passwd/root-password-crypted * set passwd/user-password-crypted U6aMy0wojraho set passwd/user-fullname $USERFULLNAME @@ -32,7 +32,7 @@ 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 casper > /dev/null <<EOF +chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF set passwd/root-password-crypted set passwd/user-password-crypted set passwd/user-fullname diff --git a/scripts/casper-bottom/12fstab b/scripts/live-bottom/12fstab index 616216a..fa9c642 100755 --- a/scripts/casper-bottom/12fstab +++ b/scripts/live-bottom/12fstab @@ -4,7 +4,7 @@ PREREQ="" DESCRIPTION="Configuring fstab..." FSTAB=/root/etc/fstab -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/13swap b/scripts/live-bottom/13swap index 9c5d0c9..fcef76c 100755 --- a/scripts/casper-bottom/13swap +++ b/scripts/live-bottom/13swap @@ -4,7 +4,7 @@ PREREQ="" DESCRIPTION="Setting up swap..." FSTAB=/root/etc/fstab -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/14locales b/scripts/live-bottom/14locales index 3ee3ef0..a03e0d1 100755 --- a/scripts/casper-bottom/14locales +++ b/scripts/live-bottom/14locales @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Setting up locales..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/15autologin b/scripts/live-bottom/15autologin index 81bd3a4..4b64dc7 100755 --- a/scripts/casper-bottom/15autologin +++ b/scripts/live-bottom/15autologin @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Setting up automatic login..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/18hostname b/scripts/live-bottom/18hostname index 19ac61f..591e4ec 100755 --- a/scripts/casper-bottom/18hostname +++ b/scripts/live-bottom/18hostname @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Setting hostname..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/19keyboard b/scripts/live-bottom/19keyboard index ef90115..d43e329 100755 --- a/scripts/casper-bottom/19keyboard +++ b/scripts/live-bottom/19keyboard @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Setting up console keyboard..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { @@ -50,21 +50,21 @@ if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"$csvariant\"/" \ /etc/default/console-setup else - casper-preseed /root console-setup/variantcode '' false + live-preseed /root console-setup/variantcode '' false fi if [ "$csmodel" ]; then chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"$csmodel\"/" \ /etc/default/console-setup else - casper-preseed /root console-setup/modelcode '' false + live-preseed /root console-setup/modelcode '' false fi else - casper-preseed /root console-setup/layoutcode '' false - casper-preseed /root console-setup/variantcode '' false - casper-preseed /root console-setup/modelcode '' false + 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 - casper-preseed /root debian-installer/keymap "$kbd" + live-preseed /root debian-installer/keymap "$kbd" fi log_end_msg diff --git a/scripts/casper-bottom/20xconfig b/scripts/live-bottom/20xconfig index c5563ed..93c8722 100755 --- a/scripts/casper-bottom/20xconfig +++ b/scripts/live-bottom/20xconfig @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Configuring X..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { @@ -48,12 +48,12 @@ if [ -n "${XDEBCONF}" -a -x /root/usr/sbin/xdebconfigurator ]; then chroot /root /usr/sbin/xdebconfigurator fi -chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF +chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF set xserver-xorg/autodetect_keyboard true fset xserver-xorg/autodetect_keyboard seen true EOF -DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 | sed -e 's, .*,,' -e q) casper-reconfigure /root xserver-xorg +DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 | sed -e 's, .*,,' -e q) live-reconfigure /root xserver-xorg umount /root/sys umount /root/proc umount /root/dev diff --git a/scripts/casper-bottom/22gnome_panel_data b/scripts/live-bottom/22gnome_panel_data index 4dd5d9d..1b4d41b 100755 --- a/scripts/casper-bottom/22gnome_panel_data +++ b/scripts/live-bottom/22gnome_panel_data @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Configuring gnome-panel-data..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { @@ -22,7 +22,7 @@ log_begin_msg "$DESCRIPTION" if [ -x /root/usr/sbin/laptop-detect ]; then if chroot /root laptop-detect; then - casper-reconfigure /root gnome-panel-data + live-reconfigure /root gnome-panel-data fi fi diff --git a/scripts/casper-bottom/22screensaver b/scripts/live-bottom/22screensaver index 39c0f22..6193a41 100755 --- a/scripts/casper-bottom/22screensaver +++ b/scripts/live-bottom/22screensaver @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Configuring screensaver..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/23etc_modules b/scripts/live-bottom/23etc_modules index 754a832..6eec342 100755 --- a/scripts/casper-bottom/23etc_modules +++ b/scripts/live-bottom/23etc_modules @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Preconfiguring /etc/modules..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/23networking b/scripts/live-bottom/23networking index 1b732d3..988206e 100755 --- a/scripts/casper-bottom/23networking +++ b/scripts/live-bottom/23networking @@ -4,7 +4,7 @@ PREREQ="" DESCRIPTION="Preconfiguring networking..." IFFILE="/root/etc/network/interfaces" -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/24preseed b/scripts/live-bottom/24preseed index cd52467..cd530ea 100755 --- a/scripts/casper-bottom/24preseed +++ b/scripts/live-bottom/24preseed @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Loading preseed file..." -. /scripts/casper-functions +. /scripts/live-functions prereqs () { @@ -32,11 +32,11 @@ for x in $(cat /proc/cmdline); do */*=*) question="${x%%=*}" value="${x#*=}" - casper-preseed /root "$question" "$value" + live-preseed /root "$question" "$value" ;; locale=*) value="${x#*=}" - casper-preseed /root debian-installer/locale "$value" + live-preseed /root debian-installer/locale "$value" ;; esac done diff --git a/scripts/casper-bottom/25configure_init b/scripts/live-bottom/25configure_init index f9a8626..1274990 100755 --- a/scripts/casper-bottom/25configure_init +++ b/scripts/live-bottom/25configure_init @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Setting up init..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/30accessibility b/scripts/live-bottom/30accessibility index 01c2386..127c48f 100755 --- a/scripts/casper-bottom/30accessibility +++ b/scripts/live-bottom/30accessibility @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Configuring accessibility options..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/31disable_update_notifier b/scripts/live-bottom/31disable_update_notifier index 2461c25..6c8b96f 100755 --- a/scripts/casper-bottom/31disable_update_notifier +++ b/scripts/live-bottom/31disable_update_notifier @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Disabling update-notifier..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/32disable_hibernation b/scripts/live-bottom/32disable_hibernation index ae4badd..813abed 100755 --- a/scripts/casper-bottom/32disable_hibernation +++ b/scripts/live-bottom/32disable_hibernation @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Configuring power management..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { @@ -23,7 +23,7 @@ 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 -# casper-reconfigure /root gnome-power-manager +# 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 diff --git a/scripts/casper-bottom/33enable_apport_crashes b/scripts/live-bottom/33enable_apport_crashes index d1c8829..1fb1145 100755 --- a/scripts/casper-bottom/33enable_apport_crashes +++ b/scripts/live-bottom/33enable_apport_crashes @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Enabling notifications about program crashes..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/34disable_kwallet b/scripts/live-bottom/34disable_kwallet index add7cca..9fd0c26 100755 --- a/scripts/casper-bottom/34disable_kwallet +++ b/scripts/live-bottom/34disable_kwallet @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Disabling kwallet..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { @@ -22,4 +22,4 @@ log_begin_msg "$DESCRIPTION" rm -f /root/usr/share/services/kded/kwalletd.desktop -log_end_msg
\ No newline at end of file +log_end_msg diff --git a/scripts/casper-bottom/35fix_language_selector b/scripts/live-bottom/35fix_language_selector index 3a22602..1fb78e5 100755 --- a/scripts/casper-bottom/35fix_language_selector +++ b/scripts/live-bottom/35fix_language_selector @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Fixing language selector..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/40install_driver_updates b/scripts/live-bottom/40install_driver_updates index 272a0ed..5822f8f 100755 --- a/scripts/casper-bottom/40install_driver_updates +++ b/scripts/live-bottom/40install_driver_updates @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Installing driver updates..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/41apt_cdrom b/scripts/live-bottom/41apt_cdrom index b4ab643..97b2cdc 100755 --- a/scripts/casper-bottom/41apt_cdrom +++ b/scripts/live-bottom/41apt_cdrom @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Adding APT-CDROM source..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-functions b/scripts/live-functions index 60721b4..60721b4 100644 --- a/scripts/casper-functions +++ b/scripts/live-functions diff --git a/scripts/casper-helpers b/scripts/live-helpers index 8402d93..8402d93 100644 --- a/scripts/casper-helpers +++ b/scripts/live-helpers diff --git a/scripts/casper-premount/10driver_updates b/scripts/live-premount/10driver_updates index 8009849..55aece5 100755 --- a/scripts/casper-premount/10driver_updates +++ b/scripts/live-premount/10driver_updates @@ -1,8 +1,8 @@ #!/bin/sh PREREQ="" -. /scripts/casper-functions -. /scripts/casper-helpers +. /scripts/live-functions +. /scripts/live-helpers prereqs() { |