X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FRELEASE%2F98-clean-chroot;h=626267f1dd159d81394f424d5449da8d6b467862;hp=056f6a44440ca523fb12d047022f8cb7191f7f7c;hb=HEAD;hpb=f92ebd9f373252cd56d9288374b36fd12d96c5b1

diff --git a/etc/grml/fai/config/scripts/RELEASE/98-clean-chroot b/etc/grml/fai/config/scripts/RELEASE/98-clean-chroot
index 056f6a4..626267f 100755
--- a/etc/grml/fai/config/scripts/RELEASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/RELEASE/98-clean-chroot
@@ -8,18 +8,22 @@
 
 set -u
 set -e
-
+. "$GRML_LIVE_CONFIG"
 
 echo "Removing /var/lib/apt/lists/*-stuff, dpkg-status-old and pkgcache.bin"
 rm -f $target/var/lib/apt/lists/*Packages \
       $target/var/lib/apt/lists/*Release \
       $target/var/lib/apt/lists/*Sources \
       $target/var/lib/apt/lists/*Index* \
+      $target/var/lib/apt/lists/*Translation* \
       $target/var/lib/apt/lists/*.gpg \
       $target/var/cache/apt-show-versions/* \
       $target/var/cache/debconf/*.dat-old \
       $target/var/cache/apt/*.bin
 
+echo "Removing /var/lib/aptitude/pkgstates.old"
+rm -f "${target}/var/lib/aptitude/pkgstates.old"
+
 # Remove all FAI logs from chroot via grml-live later then
 echo "Setting up /etc/grml_fai_release for grml-live"
 touch $target/etc/grml_fai_release
@@ -28,9 +32,13 @@ echo "Removing all files inside /root"
 rm -rf $target/root
 mkdir -m 0755 $target/root
 
-echo "Removing all files inside /home/grml"
-rm -rf $target/home/grml
-mkdir -m 0755 $target/home/grml
+echo "Removing all files inside /home/${USERNAME}"
+rm -rf "${target}/home/${USERNAME}"
+mkdir -m 0755 "${target}/home/${USERNAME}"
+$ROOTCMD chown "${USERNAME}:${USERNAME}" "/home/${USERNAME}"
+
+echo "Syncing /home/${USERNAME}/ with data from /etc/skel/:"
+$ROOTCMD su -s /bin/sh "${USERNAME}" -c "rsync -Hav /etc/skel/ /home/${USERNAME}/"
 
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2