From 32b956ecd785a95d51bc47df6a549b77e707f4e5 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 27 Feb 2014 14:36:47 +0100 Subject: Generalize file backup routines in final tidying. --- content/desktop/base/preseed.cfg | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/content/desktop/base/preseed.cfg b/content/desktop/base/preseed.cfg index b9d184b..94cddba 100644 --- a/content/desktop/base/preseed.cfg +++ b/content/desktop/base/preseed.cfg @@ -52,12 +52,15 @@ 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 # * 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" } #cd /target/etc/xdg/xfce4/xfconf/xfce-perchannel-xml -#cp -a ../../panel/default.xml xfce4-panel.xml && touch xfce4-panel.xml.orig -#cp -a xfce4-panel.xml xfce4-panel.xml.old && sed -i -r -e 's,xfce4-appfinder,exo-mail-reader,' xfce4-panel.xml -#cp -a xfce4-session.xml xfce4-session.xml.orig && sed -i -r -e 's,(]*>),\1\n ,' xfce4-session.xml -d-i preseed/late_command string 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 && cd /target/etc/xdg/xfce4/xfconf/xfce-perchannel-xml && cp -a ../../panel/default.xml xfce4-panel.xml && touch xfce4-panel.xml.orig && cp -a xfce4-panel.xml xfce4-panel.xml.old && sed -i -r -e 's,xfce4-appfinder,exo-mail-reader,' xfce4-panel.xml && cp -a xfce4-session.xml xfce4-session.xml.orig && sed -i -r -e 's,(]*>),\1\n ,' xfce4-session.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,(]*>),\1\n ,' 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,(]*>),\1\n ,' xfce4-session.xml -- cgit v1.2.3