Separate tweaks from skeleton file. Fix syntax of tweak functions (code inside {} must end with ; ).

1 files changed, 2 insertions, 20 deletions

diff --git a/skel/preseed.cfg.in b/skel/preseed.cfg.in
index c9d077c..3f49904 100644
--- a/skel/preseed.cfg.in
+++ b/skel/preseed.cfg.in
@@ -40,23 +40,5 @@ popularity-contest popularity-contest/participate boolean true
 # enable unattended-upgrades
 unattended-upgrades unattended-upgrades/enable_auto_updates boolean true
 
-# tidy loose ends...
-#  * fix mark auto-installed packages as such
-#  * for any file edited or created, preserve a backup with suffix .orig
-#  * auto-repair inconsistent filesystems during boot
-#  * sleep when lid is closed, and modernize logic of radio on/off button
-#  * silence confusing panel question at initial XFCE login
-#  * replace appfinder with mail-reader in default XFCE panel
-#  * disable storing Xfce session at logout by default
-#set -e
-#chroot /target apt-mark auto $(chroot /target apt-mark showmanual | grep '^lib') acpi acpi-support-base acpid adduser apt apt-utils aptitude-common base-files base-passwd bash bash-completion bsdmainutils bsdutils busybox coreutils cpio cron dash debconf debconf-i18n debian-archive-keyring debianutils diffutils dmidecode dpkg e2fslibs e2fsprogs findutils fonts-freefont-ttf gcc-4.7-base gnupg gpgv grep groff-base grub-common gzip hostname ifupdown initramfs-tools initscripts insserv install-info iproute isc-dhcp-client isc-dhcp-common keyboard-configuration kmod laptop-detect linux-image-amd64 locales login logrotate lsb-base mawk mount multiarch-support ncurses-base ncurses-bin net-tools netbase netcat-traditional passwd pciutils perl-base procps readline-common rsyslog sed sensible-utils sysv-rc sysvinit sysvinit-utils tar tasksel tasksel-data tzdata udev usbutils util-linux uuid-runtime vim-common xz-utils zlib1g
-#_backup() { set -e; [ -e "$1.orig" ] || if [ -e "$1" ]; then cp -a "$1" "$1.orig"; else touch "$1.orig"; fi }
-#_clone() { set -e; _backup "$2"; cp -a "$1" "$2" }
-#_setvar() { set -e; _backup "$1"; sed -i -r -e "s,^#?($2)=.*,\\1=$3," "$1" }
-#_setvar /target/etc/default/rcS FSCKFIX yes
-#_setvar /target/etc/default/acpi-support LID_SLEEP true
-#_setvar /target/etc/default/acpi-support WIRELESS_BLUETOOTH_SYNC true
-#cd /target/etc/xdg/xfce4/xfconf/xfce-perchannel-xml
-#_clone ../../panel/default.xml xfce4-panel.xml; sed -i -r -e 's,xfce4-appfinder,exo-mail-reader,' xfce4-panel.xml
-#_backup xfce4-session.xml; sed -i -r -e 's,(<property name="general"[^>]*>),\1\n    <property name="SaveOnExit" type="bool" value="false"/>,' xfce4-session.xml
-d-i preseed/late_command string set -e;chroot /target apt-mark auto $(chroot /target apt-mark showmanual | grep '^lib') acpi acpi-support-base acpid adduser apt apt-utils aptitude-common base-files base-passwd bash bash-completion bsdmainutils bsdutils busybox coreutils cpio cron dash debconf debconf-i18n debian-archive-keyring debianutils diffutils dmidecode dpkg e2fslibs e2fsprogs findutils fonts-freefont-ttf gcc-4.7-base gnupg gpgv grep groff-base grub-common gzip hostname ifupdown initramfs-tools initscripts insserv install-info iproute isc-dhcp-client isc-dhcp-common keyboard-configuration kmod laptop-detect linux-image-amd64 locales login logrotate lsb-base mawk mount multiarch-support ncurses-base ncurses-bin net-tools netbase netcat-traditional passwd pciutils perl-base procps readline-common rsyslog sed sensible-utils sysv-rc sysvinit sysvinit-utils tar tasksel tasksel-data tzdata udev usbutils util-linux uuid-runtime vim-common xz-utils zlib1g;_orig() { set -e; [ -e "$1.orig" ] || if [ -e "$1" ]; then cp -a "$1" "$1.orig"; else touch "$1.orig"; fi };_clone() { set -e; _orig "$2"; cp -a "$1" "$2" };cd /target/etc/xdg/xfce4/xfconf/xfce-perchannel-xml;_clone ../../panel/default.xml xfce4-panel.xml; sed -i -r -e 's,xfce4-appfinder,exo-mail-reader,' xfce4-panel.xml;_orig xfce4-session.xml; sed -i -r -e 's,(<property name="general"[^>]*>),\1\n    <property name="SaveOnExit" type="bool" value="false"/>,' xfce4-session.xml
+__TWEAKDESC__
+d-i preseed/late_command string __TWEAKLIST__