diff options
Diffstat (limited to 'scripts/casper-bottom')
21 files changed, 78 insertions, 20 deletions
diff --git a/scripts/casper-bottom/05mountpoints b/scripts/casper-bottom/05mountpoints index 20a28fd..be76755 100755 --- a/scripts/casper-bottom/05mountpoints +++ b/scripts/casper-bottom/05mountpoints @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Moving mount points..." -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/10adduser b/scripts/casper-bottom/10adduser index e85f947..af7754b 100755 --- a/scripts/casper-bottom/10adduser +++ b/scripts/casper-bottom/10adduser @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Adding live session user..." -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/12fstab b/scripts/casper-bottom/12fstab index 00e5c50..ac39396 100755 --- a/scripts/casper-bottom/12fstab +++ b/scripts/casper-bottom/12fstab @@ -4,7 +4,7 @@ PREREQ="" DESCRIPTION="Configuring fstab..." FSTAB=/root/etc/fstab -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/13swap b/scripts/casper-bottom/13swap index 44d73f3..986b079 100755 --- a/scripts/casper-bottom/13swap +++ b/scripts/casper-bottom/13swap @@ -4,7 +4,7 @@ PREREQ="" DESCRIPTION="Setting up swap..." FSTAB=/root/etc/fstab -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/14locales b/scripts/casper-bottom/14locales index f69fa0f..4297a58 100755 --- a/scripts/casper-bottom/14locales +++ b/scripts/casper-bottom/14locales @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Setting up locales..." -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin index ff88721..cdaa038 100755 --- a/scripts/casper-bottom/15autologin +++ b/scripts/casper-bottom/15autologin @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Setting up automatic login..." -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/18hostname b/scripts/casper-bottom/18hostname index 7ac5b00..19ac61f 100755 --- a/scripts/casper-bottom/18hostname +++ b/scripts/casper-bottom/18hostname @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Setting hostname..." -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/19keyboard b/scripts/casper-bottom/19keyboard index d738faf..1d833ad 100755 --- a/scripts/casper-bottom/19keyboard +++ b/scripts/casper-bottom/19keyboard @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Setting up keyboard..." -. /scripts/functions +. /scripts/casper-functions prereqs() { @@ -39,7 +39,7 @@ for x in $(cat /proc/cmdline); do done if [ "$cslayout" ] && [ -x /root/bin/setupcon ] && \ - [ -f /etc/default/console-setup ]; then + [ -f /root/etc/default/console-setup ]; then chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"$cslayout\"/" \ /etc/default/console-setup if [ "$csvariant" ]; then diff --git a/scripts/casper-bottom/20xconfig b/scripts/casper-bottom/20xconfig index b8a4552..3916f41 100755 --- a/scripts/casper-bottom/20xconfig +++ b/scripts/casper-bottom/20xconfig @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Configuring X..." -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/22gnome_panel_data b/scripts/casper-bottom/22gnome_panel_data index 5509ce1..4dd5d9d 100755 --- a/scripts/casper-bottom/22gnome_panel_data +++ b/scripts/casper-bottom/22gnome_panel_data @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Configuring gnome-panel-data..." -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/22screensaver b/scripts/casper-bottom/22screensaver index ff3ec81..e5965e8 100755 --- a/scripts/casper-bottom/22screensaver +++ b/scripts/casper-bottom/22screensaver @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Configuring screensaver..." -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/23etc_modules b/scripts/casper-bottom/23etc_modules index 622d96e..754a832 100755 --- a/scripts/casper-bottom/23etc_modules +++ b/scripts/casper-bottom/23etc_modules @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Preconfiguring /etc/modules..." -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/23networking b/scripts/casper-bottom/23networking index 8f4b698..f410321 100755 --- a/scripts/casper-bottom/23networking +++ b/scripts/casper-bottom/23networking @@ -4,7 +4,7 @@ PREREQ="" DESCRIPTION="Preconfiguring networking..." IFFILE="/root/etc/network/interfaces" -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/24preseed b/scripts/casper-bottom/24preseed index 98a9864..cd52467 100755 --- a/scripts/casper-bottom/24preseed +++ b/scripts/casper-bottom/24preseed @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Loading preseed file..." -. /scripts/functions +. /scripts/casper-functions prereqs () { @@ -26,6 +26,9 @@ for x in $(cat /proc/cmdline); do preseed/file=*) location="${x#preseed/file=}" ;; + file=*) + location="${x#file=}" + ;; */*=*) question="${x%%=*}" value="${x#*=}" diff --git a/scripts/casper-bottom/25configure_init b/scripts/casper-bottom/25configure_init index 84fa741..573b2a6 100755 --- a/scripts/casper-bottom/25configure_init +++ b/scripts/casper-bottom/25configure_init @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Setting up init..." -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/30accessibility b/scripts/casper-bottom/30accessibility index e8e7e8a..cc64832 100755 --- a/scripts/casper-bottom/30accessibility +++ b/scripts/casper-bottom/30accessibility @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Configuring accessibility options..." -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/31disable_update_notifier b/scripts/casper-bottom/31disable_update_notifier index 082b818..10b86a2 100755 --- a/scripts/casper-bottom/31disable_update_notifier +++ b/scripts/casper-bottom/31disable_update_notifier @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Disabling update-notifier..." -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/32disable_hibernation b/scripts/casper-bottom/32disable_hibernation index badcef6..47344fa 100755 --- a/scripts/casper-bottom/32disable_hibernation +++ b/scripts/casper-bottom/32disable_hibernation @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Configuring power management..." -. /scripts/functions +. /scripts/casper-functions prereqs() { diff --git a/scripts/casper-bottom/33disable_binary_drivers b/scripts/casper-bottom/33disable_binary_drivers index 6bc2279..971ce8e 100755 --- a/scripts/casper-bottom/33disable_binary_drivers +++ b/scripts/casper-bottom/33disable_binary_drivers @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Configuring some drivers..." -. /scripts/functions +. /scripts/casper-functions prereqs() { @@ -23,3 +23,5 @@ log_begin_msg "$DESCRIPTION" if [ -e /root/etc/default/linux-restricted-modules-common ]; then echo 'DISABLED_MODULES="fglrx nv"' >> /root/etc/default/linux-restricted-modules-common fi + +log_end_msg
\ No newline at end of file diff --git a/scripts/casper-bottom/34disable_kwallet b/scripts/casper-bottom/34disable_kwallet new file mode 100755 index 0000000..add7cca --- /dev/null +++ b/scripts/casper-bottom/34disable_kwallet @@ -0,0 +1,25 @@ +#! /bin/sh + +PREREQ="" +DESCRIPTION="Disabling kwallet..." + +. /scripts/casper-functions + +prereqs() +{ + echo "$PREREQ" +} + +case $1 in +# get pre-requisites +prereqs) + prereqs + exit 0 + ;; +esac + +log_begin_msg "$DESCRIPTION" + +rm -f /root/usr/share/services/kded/kwalletd.desktop + +log_end_msg
\ No newline at end of file diff --git a/scripts/casper-bottom/35fix_language_selector b/scripts/casper-bottom/35fix_language_selector new file mode 100755 index 0000000..96a1d6c --- /dev/null +++ b/scripts/casper-bottom/35fix_language_selector @@ -0,0 +1,28 @@ +#! /bin/sh + +PREREQ="" +DESCRIPTION="Fixing language selector..." + +. /scripts/casper-functions + +prereqs() +{ + echo "$PREREQ" +} + +case $1 in +# get pre-requisites +prereqs) + prereqs + exit 0 + ;; +esac + +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 + +log_end_msg |